提交 01c109a0 编写于 作者: Z Zachary Scott

Merge pull request #15722 from akshay-vishnoi/spell-correct

[ci skip] /mysql/i -> MySQL, Spell correct in continuation to #15555
......@@ -193,7 +193,7 @@ def supports_statement_cache?
# * You are creating a nested (savepoint) transaction
#
# The mysql, mysql2 and postgresql adapters support setting the transaction
# isolation level. However, support is disabled for mysql versions below 5,
# isolation level. However, support is disabled for MySQL versions below 5,
# because they are affected by a bug[http://bugs.mysql.com/bug.php?id=39170]
# which means the isolation level gets persisted outside the transaction.
def transaction(options = {})
......@@ -338,8 +338,8 @@ def sanitize_limit(limit)
end
# The default strategy for an UPDATE with joins is to use a subquery. This doesn't work
# on mysql (even when aliasing the tables), but mysql allows using JOIN directly in
# an UPDATE statement, so in the mysql adapters we redefine this to do that.
# on MySQL (even when aliasing the tables), but MySQL allows using JOIN directly in
# an UPDATE statement, so in the MySQL adapters we redefine this to do that.
def join_to_update(update, select) #:nodoc:
key = update.key
subselect = subquery_for(key, select)
......
......@@ -788,7 +788,7 @@ def add_index_sort_order(option_strings, column_names, options = {})
return option_strings
end
# Overridden by the mysql adapter for supporting index lengths
# Overridden by the MySQL adapter for supporting index lengths
def quoted_columns_for_index(column_names, options = {})
option_strings = Hash[column_names.map {|name| [name, '']}]
......
......@@ -75,7 +75,7 @@ def default
end
def has_default?
return false if blob_or_text_column? #mysql forbids defaults on blob and text columns
return false if blob_or_text_column? # MySQL forbids defaults on blob and text columns
super
end
......@@ -213,7 +213,7 @@ def new_column(field, default, cast_type, sql_type = nil, null = true, collation
Column.new(field, default, cast_type, sql_type, null, collation, strict_mode?, extra)
end
# Must return the Mysql error number from the exception, if the exception has an
# Must return the MySQL error number from the exception, if the exception has an
# error number.
def error_number(exception) # :nodoc:
raise NotImplementedError
......
......@@ -409,7 +409,7 @@ def exec_stmt(sql, name, binds)
stmt.execute(*type_casted_binds.map { |_, val| val })
rescue Mysql::Error => e
# Older versions of MySQL leave the prepared statement in a bad
# place when an error occurs. To support older mysql versions, we
# place when an error occurs. To support older MySQL versions, we
# need to close the statement and delete the statement from the
# cache.
stmt.close
......
......@@ -124,7 +124,7 @@ def root_configuration_without_database
end
def root_password
$stdout.print "Please provide the root password for your mysql installation\n>"
$stdout.print "Please provide the root password for your MySQL installation\n>"
$stdin.gets.strip
end
......
......@@ -21,7 +21,7 @@ def test_mixed_encoding
name = binary.name
# Mysql adapter doesn't properly encode things, so we have to do it
# MySQL adapter doesn't properly encode things, so we have to do it
if current_adapter?(:MysqlAdapter)
name.force_encoding(Encoding::UTF_8)
end
......
......@@ -62,7 +62,7 @@ def test_native_decimal_insert_manual_vs_automatic
# Do a manual insertion
if current_adapter?(:OracleAdapter)
connection.execute "insert into test_models (id, wealth) values (people_seq.nextval, 12345678901234567890.0123456789)"
elsif current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003 #before mysql 5.0.3 decimals stored as strings
elsif current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003 #before MySQL 5.0.3 decimals stored as strings
connection.execute "insert into test_models (wealth) values ('12345678901234567890.0123456789')"
elsif current_adapter?(:PostgreSQLAdapter)
connection.execute "insert into test_models (wealth) values (12345678901234567890.0123456789)"
......
......@@ -3,7 +3,7 @@
module ActiveRecord
class Migration
class LoggerTest < ActiveRecord::TestCase
# mysql can't roll back ddl changes
# MySQL can't roll back ddl changes
self.use_transactional_fixtures = false
Migration = Struct.new(:name, :version) do
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册