Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
01c109a0
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
01c109a0
编写于
6月 15, 2014
作者:
Z
Zachary Scott
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15722 from akshay-vishnoi/spell-correct
[ci skip] /mysql/i -> MySQL, Spell correct in continuation to #15555
上级
38d4ea7c
889e65e3
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
11 addition
and
11 deletion
+11
-11
activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
...ecord/connection_adapters/abstract/database_statements.rb
+3
-3
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
..._record/connection_adapters/abstract/schema_statements.rb
+1
-1
activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
...tive_record/connection_adapters/abstract_mysql_adapter.rb
+2
-2
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
...rd/lib/active_record/connection_adapters/mysql_adapter.rb
+1
-1
activerecord/lib/active_record/tasks/mysql_database_tasks.rb
activerecord/lib/active_record/tasks/mysql_database_tasks.rb
+1
-1
activerecord/test/cases/binary_test.rb
activerecord/test/cases/binary_test.rb
+1
-1
activerecord/test/cases/migration/column_attributes_test.rb
activerecord/test/cases/migration/column_attributes_test.rb
+1
-1
activerecord/test/cases/migration/logger_test.rb
activerecord/test/cases/migration/logger_test.rb
+1
-1
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
浏览文件 @
01c109a0
...
...
@@ -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
)
...
...
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
浏览文件 @
01c109a0
...
...
@@ -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
,
''
]}]
...
...
activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
浏览文件 @
01c109a0
...
...
@@ -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 My
sql
error number from the exception, if the exception has an
# Must return the My
SQL
error number from the exception, if the exception has an
# error number.
def
error_number
(
exception
)
# :nodoc:
raise
NotImplementedError
...
...
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
浏览文件 @
01c109a0
...
...
@@ -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
...
...
activerecord/lib/active_record/tasks/mysql_database_tasks.rb
浏览文件 @
01c109a0
...
...
@@ -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
...
...
activerecord/test/cases/binary_test.rb
浏览文件 @
01c109a0
...
...
@@ -21,7 +21,7 @@ def test_mixed_encoding
name
=
binary
.
name
# My
sql
adapter doesn't properly encode things, so we have to do it
# My
SQL
adapter doesn't properly encode things, so we have to do it
if
current_adapter?
(
:MysqlAdapter
)
name
.
force_encoding
(
Encoding
::
UTF_8
)
end
...
...
activerecord/test/cases/migration/column_attributes_test.rb
浏览文件 @
01c109a0
...
...
@@ -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)"
...
...
activerecord/test/cases/migration/logger_test.rb
浏览文件 @
01c109a0
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录