Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
fd6c8cdf
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,体验更适合开发者的 AI 搜索 >>
提交
fd6c8cdf
编写于
6月 28, 2017
作者:
R
Rafael França
提交者:
Ryuta Kamizono
10月 30, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge pull request #29609 from tsukasaoishi/query_cache_from_beginning
Enable query cache if set a configurations
上级
d8c9c80a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
20 deletion
+13
-20
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+5
-0
activerecord/lib/active_record/query_cache.rb
activerecord/lib/active_record/query_cache.rb
+6
-6
activerecord/test/cases/query_cache_test.rb
activerecord/test/cases/query_cache_test.rb
+2
-14
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
fd6c8cdf
*
Query cache was unavailable when entering the
`ActiveRecord::Base.cache`
block
without being connected.
*Tsukasa Oishi*
*
Fix
`bin/rails db:setup`
and
`bin/rails db:test:prepare`
create wrong
ar_internal_metadata's data for a test database.
...
...
activerecord/lib/active_record/query_cache.rb
浏览文件 @
fd6c8cdf
...
...
@@ -5,20 +5,20 @@ module ClassMethods
# Enable the query cache within the block if Active Record is configured.
# If it's not, it will execute the given block.
def
cache
(
&
block
)
if
connected?
connection
.
cache
(
&
block
)
else
if
configurations
.
empty?
yield
else
connection
.
cache
(
&
block
)
end
end
# Disable the query cache within the block if Active Record is configured.
# If it's not, it will execute the given block.
def
uncached
(
&
block
)
if
connected?
connection
.
uncached
(
&
block
)
else
if
configurations
.
empty?
yield
else
connection
.
uncached
(
&
block
)
end
end
end
...
...
activerecord/test/cases/query_cache_test.rb
浏览文件 @
fd6c8cdf
...
...
@@ -320,18 +320,7 @@ def test_cache_is_ignored_for_locked_relations
end
end
def
test_cache_is_available_when_connection_is_connected
conf
=
ActiveRecord
::
Base
.
configurations
ActiveRecord
::
Base
.
configurations
=
{}
Task
.
cache
do
assert_queries
(
1
)
{
Task
.
find
(
1
);
Task
.
find
(
1
)
}
end
ensure
ActiveRecord
::
Base
.
configurations
=
conf
end
def
test_cache_is_not_available_when_using_a_not_connected_connection
def
test_cache_is_available_when_using_a_not_connected_connection
with_temporary_connection_pool
do
spec_name
=
Task
.
connection_specification_name
conf
=
ActiveRecord
::
Base
.
configurations
[
"arunit"
].
merge
(
"name"
=>
"test2"
)
...
...
@@ -348,8 +337,7 @@ def test_cache_is_not_available_when_using_a_not_connected_connection
end
ActiveRecord
::
FixtureSet
.
create_fixtures
(
self
.
class
.
fixture_path
,
[
"tasks"
],
{},
ActiveRecord
::
Base
)
end
Task
.
connection
# warmup postgresql connection setup queries
assert_queries
(
2
)
{
Task
.
find
(
1
);
Task
.
find
(
1
)
}
assert_queries
(
1
)
{
Task
.
find
(
1
);
Task
.
find
(
1
)
}
ensure
ActiveRecord
::
Base
.
connection_handler
.
remove_connection
(
Task
.
connection_specification_name
)
Task
.
connection_specification_name
=
spec_name
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录