Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
323b7585
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,发现更多精彩内容 >>
提交
323b7585
编写于
5月 03, 2011
作者:
J
Josh Kalderimis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
added the mysql schema test to mysql2 adapter, and fixed the corresponding failures
上级
d54ce712
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
54 addition
and
3 deletion
+54
-3
activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
...d/lib/active_record/connection_adapters/mysql2_adapter.rb
+17
-2
activerecord/test/cases/adapters/mysql/schema_test.rb
activerecord/test/cases/adapters/mysql/schema_test.rb
+1
-1
activerecord/test/cases/adapters/mysql2/schema_test.rb
activerecord/test/cases/adapters/mysql2/schema_test.rb
+36
-0
未找到文件。
activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
浏览文件 @
323b7585
...
...
@@ -410,12 +410,27 @@ def collation
show_variable
'collation_database'
end
def
tables
(
name
=
nil
)
execute
(
"SHOW TABLES"
,
'SCHEMA'
).
collect
do
|
field
|
def
tables
(
name
=
nil
,
database
=
nil
)
#:nodoc:
sql
=
[
"SHOW TABLES"
,
database
].
compact
.
join
(
' IN '
)
execute
(
sql
,
'SCHEMA'
).
collect
do
|
field
|
field
.
first
end
end
def
table_exists?
(
name
)
return
true
if
super
name
=
name
.
to_s
schema
,
table
=
name
.
split
(
'.'
,
2
)
unless
table
# A table was provided without a schema
table
=
schema
schema
=
nil
end
tables
(
nil
,
schema
).
include?
table
end
def
drop_table
(
table_name
,
options
=
{})
super
(
table_name
,
options
)
end
...
...
activerecord/test/cases/adapters/mysql/schema_test.rb
浏览文件 @
323b7585
...
...
@@ -31,6 +31,6 @@ def test_table_exists?
def
test_table_exists_wrong_schema
assert
(
!
@connection
.
table_exists?
(
"
#{
@db_name
}
.zomg"
),
"table should not exist"
)
end
end
if
current_adapter?
(
:MysqlAdapter
)
end
end
end
activerecord/test/cases/adapters/mysql2/schema_test.rb
0 → 100644
浏览文件 @
323b7585
require
"cases/helper"
require
'models/post'
require
'models/comment'
module
ActiveRecord
module
ConnectionAdapters
class
Mysql2SchemaTest
<
ActiveRecord
::
TestCase
fixtures
:posts
def
setup
@connection
=
ActiveRecord
::
Base
.
connection
db
=
Post
.
connection_pool
.
spec
.
config
[
:database
]
table
=
Post
.
table_name
@db_name
=
db
@omgpost
=
Class
.
new
(
Post
)
do
set_table_name
"
#{
db
}
.
#{
table
}
"
def
self
.
name
;
'Post'
;
end
end
end
def
test_schema
assert
@omgpost
.
find
(
:first
)
end
def
test_table_exists?
name
=
@omgpost
.
table_name
assert
@connection
.
table_exists?
(
name
),
"
#{
name
}
table should exist"
end
def
test_table_exists_wrong_schema
assert
(
!
@connection
.
table_exists?
(
"
#{
@db_name
}
.zomg"
),
"table should not exist"
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录