diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2015-12-20 11:56:33 -0700 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-12-20 11:56:33 -0700 |
commit | 0207464f9b7a00d4916dbd9bc864515524097b7d (patch) | |
tree | 10edd1bac70634ef9d1d166e4e48743bce4c0667 /activerecord | |
parent | fb44e217ef67498cf8e5422454b1bc72bfd77417 (diff) | |
parent | d88cc3454e90ef7d60b160f5294a996877e182e8 (diff) | |
download | rails-0207464f9b7a00d4916dbd9bc864515524097b7d.tar.gz rails-0207464f9b7a00d4916dbd9bc864515524097b7d.tar.bz2 rails-0207464f9b7a00d4916dbd9bc864515524097b7d.zip |
Merge pull request #22704 from rajcybage/mysql_fix
mysql2 adapter instead of mysql [ci skip]
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/quoting.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb index 9ec0a67c8f..bcc41acaa1 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb @@ -93,7 +93,7 @@ module ActiveRecord # Override to return the quoted table name for assignment. Defaults to # table quoting. # - # This works for mysql and mysql2 where table.column can be used to + # This works for mysql2 where table.column can be used to # resolve ambiguity. # # We override this in the sqlite3 and postgresql adapters to use only diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index f8c9e13392..6b73647492 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -106,7 +106,7 @@ module ActiveRecord ## # :singleton-method: - # By default, the MysqlAdapter will consider all columns of type <tt>tinyint(1)</tt> + # By default, the Mysql2Adapter will consider all columns of type <tt>tinyint(1)</tt> # as boolean. If you wish to disable this emulation (which was the default # behavior in versions 0.13.1 and earlier) you can add the following line # to your application.rb file: @@ -400,7 +400,7 @@ module ActiveRecord log(sql, name) { @connection.query(sql) } end - # MysqlAdapter has to free a result after using it, so we use this method to write + # Mysql2Adapter has to free a result after using it, so we use this method to write # stuff in an abstract way without concerning ourselves about whether it needs to be # explicitly freed or not. def execute_and_free(sql, name = nil) #:nodoc: |