mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #22704 from rajcybage/mysql_fix
mysql2 adapter instead of mysql [ci skip]
This commit is contained in:
commit
0207464f9b
3 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -319,7 +319,7 @@ All these configuration options are delegated to the `I18n` library.
|
|||
|
||||
The MySQL adapter adds one additional configuration option:
|
||||
|
||||
* `ActiveRecord::ConnectionAdapters::MysqlAdapter.emulate_booleans` controls whether Active Record will consider all `tinyint(1)` columns in a MySQL database to be booleans and is true by default.
|
||||
* `ActiveRecord::ConnectionAdapters::Mysql[2]Adapter.emulate_booleans` controls whether Active Record will consider all `tinyint(1)` columns in a MySQL database to be booleans and is true by default.
|
||||
|
||||
The schema dumper adds one additional configuration option:
|
||||
|
||||
|
|
Loading…
Reference in a new issue