kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #32310 from sodabrew/mysql2-0.4-0.5

Browse source 
Support mysql2 0.4.x and 0.5.x
This commit is contained in:
Ryuta Kamizono 2018-03-22 02:58:57 +09:00 committed by GitHub
commit 7e06d9cb2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
View file

@ -3,7 +3,7 @@
require "active_record/connection_adapters/abstract_mysql_adapter" require "active_record/connection_adapters/abstract_mysql_adapter"
require "active_record/connection_adapters/mysql/database_statements" require "active_record/connection_adapters/mysql/database_statements"
gem "mysql2", "~> 0.4.4" gem "mysql2", ">= 0.4.4", "< 0.6.0"
require "mysql2" require "mysql2"
module ActiveRecord module ActiveRecord

2
railties/lib/rails/generators/app_base.rb
View file

@ -299,7 +299,7 @@ module Rails
def gem_for_database def gem_for_database
# %w( mysql postgresql sqlite3 oracle frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql ) # %w( mysql postgresql sqlite3 oracle frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql )
case options[:database] case options[:database]
when "mysql" then ["mysql2", ["~> 0.4.4"]] when "mysql" then ["mysql2", [">= 0.4.4", "< 0.6.0"]]
when "postgresql" then ["pg", [">= 0.18", "< 2.0"]] when "postgresql" then ["pg", [">= 0.18", "< 2.0"]]
when "oracle" then ["activerecord-oracle_enhanced-adapter", nil] when "oracle" then ["activerecord-oracle_enhanced-adapter", nil]
when "frontbase" then ["ruby-frontbase", nil] when "frontbase" then ["ruby-frontbase", nil]