Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e06878c2
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,发现更多精彩内容 >>
提交
e06878c2
编写于
8月 26, 2008
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of git@github.com:rails/rails
上级
00d2165f
ab1e82b8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
7 deletion
+8
-7
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
...b/active_record/connection_adapters/postgresql_adapter.rb
+2
-2
activerecord/test/cases/associations_test.rb
activerecord/test/cases/associations_test.rb
+2
-2
activerecord/test/cases/query_cache_test.rb
activerecord/test/cases/query_cache_test.rb
+3
-2
ci/ci_build.rb
ci/ci_build.rb
+1
-1
未找到文件。
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
浏览文件 @
e06878c2
...
...
@@ -23,8 +23,8 @@ def self.postgresql_connection(config) # :nodoc:
config
=
config
.
symbolize_keys
host
=
config
[
:host
]
port
=
config
[
:port
]
||
5432
username
=
config
[
:username
].
to_s
password
=
config
[
:password
].
to_s
username
=
config
[
:username
].
to_s
if
config
[
:username
]
password
=
config
[
:password
].
to_s
if
config
[
:password
]
if
config
.
has_key?
(
:database
)
database
=
config
[
:database
]
...
...
activerecord/test/cases/associations_test.rb
浏览文件 @
e06878c2
...
...
@@ -27,7 +27,7 @@
class
AssociationsTest
<
ActiveRecord
::
TestCase
fixtures
:accounts
,
:companies
,
:developers
,
:projects
,
:developers_projects
,
:computers
:computers
,
:people
,
:readers
def
test_include_with_order_works
assert_nothing_raised
{
Account
.
find
(
:first
,
:order
=>
'id'
,
:include
=>
:firm
)}
...
...
@@ -45,7 +45,7 @@ def test_should_construct_new_finder_sql_after_create
assert_equal
[],
person
.
readers
.
find
(
:all
)
person
.
save!
reader
=
Reader
.
create!
:person
=>
person
,
:post
=>
Post
.
new
(
:title
=>
"foo"
,
:body
=>
"bar"
)
assert
_equal
[
reader
],
person
.
readers
.
find
(
:all
)
assert
person
.
readers
.
find
(
reader
.
id
)
end
def
test_force_reload
...
...
activerecord/test/cases/query_cache_test.rb
浏览文件 @
e06878c2
...
...
@@ -116,8 +116,9 @@ def test_cache_is_expired_by_habtm_update
def
test_cache_is_expired_by_habtm_delete
ActiveRecord
::
Base
.
connection
.
expects
(
:clear_query_cache
).
times
(
2
)
ActiveRecord
::
Base
.
cache
do
c
=
Category
.
find
(
:first
)
p
=
Post
.
find
(
:first
)
c
=
Category
.
find
(
1
)
p
=
Post
.
find
(
1
)
assert
p
.
categories
.
any?
p
.
categories
.
delete_all
end
end
...
...
ci/ci_build.rb
浏览文件 @
e06878c2
...
...
@@ -14,7 +14,7 @@
# for now, use the no-passwd sudoers approach (documented in ci_setup_notes.txt)
# A security hole, but there is nothing valuable on rails CI box anyway.
build_results
[
:geminstaller
]
=
system
'sudo geminstaller --config=#{root_dir}/ci/geminstaller.yml --exceptions'
build_results
[
:geminstaller
]
=
system
"sudo geminstaller --config=
#{
root_dir
}
/ci/geminstaller.yml --exceptions"
cd
"
#{
root_dir
}
/activesupport"
do
puts
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录