Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
82a13625
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 搜索 >>
未验证
提交
82a13625
编写于
3月 03, 2020
作者:
B
bogdanvlviv
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename 'db' to 'test/db' in Active Record's tests
上级
22877a9d
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
75 addition
and
84 deletion
+75
-84
activerecord/.gitignore
activerecord/.gitignore
+1
-1
activerecord/test/cases/adapters/sqlite3/transaction_test.rb
activerecord/test/cases/adapters/sqlite3/transaction_test.rb
+1
-1
activerecord/test/cases/connection_adapters/connection_handler_test.rb
...test/cases/connection_adapters/connection_handler_test.rb
+25
-27
activerecord/test/cases/connection_adapters/connection_handlers_multi_db_test.rb
.../connection_adapters/connection_handlers_multi_db_test.rb
+21
-22
activerecord/test/cases/connection_adapters/connection_handlers_multi_pool_config_test.rb
...on_adapters/connection_handlers_multi_pool_config_test.rb
+3
-4
activerecord/test/cases/connection_adapters/connection_handlers_sharding_db_test.rb
...nnection_adapters/connection_handlers_sharding_db_test.rb
+20
-22
activerecord/test/cases/test_databases_test.rb
activerecord/test/cases/test_databases_test.rb
+4
-7
未找到文件。
activerecord/.gitignore
浏览文件 @
82a13625
/db/
/sqlnet.log
/test/config.yml
/test/db/
/test/fixtures/*.sqlite*
activerecord/test/cases/adapters/sqlite3/transaction_test.rb
浏览文件 @
82a13625
...
...
@@ -108,7 +108,7 @@ def shared_cache_flags
def
with_connection
(
options
=
{})
db_config
=
ActiveRecord
::
Base
.
configurations
.
configs_for
(
env_name:
"arunit"
,
name:
"primary"
)
conn_options
=
options
.
reverse_merge
(
database:
in_memory_db?
?
"db/file::memory:"
:
db_config
.
database
database:
in_memory_db?
?
"
test/
db/file::memory:"
:
db_config
.
database
)
conn
=
ActiveRecord
::
Base
.
sqlite3_connection
(
conn_options
)
...
...
activerecord/test/cases/connection_adapters/connection_handler_test.rb
浏览文件 @
82a13625
...
...
@@ -47,14 +47,14 @@ def test_establish_connection_using_3_levels_config
config
=
{
"default_env"
=>
{
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/readonly.sqlite3"
},
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/readonly.sqlite3"
},
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
},
"another_env"
=>
{
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/bad-readonly.sqlite3"
},
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/bad-primary.sqlite3"
}
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/bad-readonly.sqlite3"
},
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/bad-primary.sqlite3"
}
},
"common"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/common.sqlite3"
}
"common"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/common.sqlite3"
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
...
...
@@ -63,13 +63,13 @@ def test_establish_connection_using_3_levels_config
@handler
.
establish_connection
(
:readonly
)
assert_not_nil
pool
=
@handler
.
retrieve_connection_pool
(
"readonly"
)
assert_equal
"db/readonly.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/readonly.sqlite3"
,
pool
.
db_config
.
database
assert_not_nil
pool
=
@handler
.
retrieve_connection_pool
(
"primary"
)
assert_equal
"db/primary.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/primary.sqlite3"
,
pool
.
db_config
.
database
assert_not_nil
pool
=
@handler
.
retrieve_connection_pool
(
"common"
)
assert_equal
"db/common.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/common.sqlite3"
,
pool
.
db_config
.
database
ensure
ActiveRecord
::
Base
.
configurations
=
@prev_configs
ENV
[
"RAILS_ENV"
]
=
previous_env
...
...
@@ -78,7 +78,7 @@ def test_establish_connection_using_3_levels_config
unless
in_memory_db?
def
test_establish_connection_with_primary_works_without_deprecation
old_config
=
ActiveRecord
::
Base
.
configurations
config
=
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
}
config
=
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
ActiveRecord
::
Base
.
configurations
=
config
@handler
.
establish_connection
(
:primary
)
...
...
@@ -93,7 +93,7 @@ def test_establish_connection_with_primary_works_without_deprecation
def
test_retrieve_connection_shows_primary_deprecation_warning_when_established_on_active_record_base
old_config
=
ActiveRecord
::
Base
.
configurations
config
=
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
}
config
=
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
ActiveRecord
::
Base
.
configurations
=
config
ActiveRecord
::
Base
.
establish_connection
(
:primary
)
...
...
@@ -110,24 +110,23 @@ def test_establish_connection_using_3_level_config_defaults_to_default_env_prima
config
=
{
"default_env"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
},
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/readonly.sqlite3"
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/readonly.sqlite3"
}
},
"another_env"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/another-primary.sqlite3"
},
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/another-readonly.sqlite3"
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/another-primary.sqlite3"
},
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/another-readonly.sqlite3"
}
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
ActiveRecord
::
Base
.
establish_connection
assert_match
"db/primary.sqlite3"
,
ActiveRecord
::
Base
.
connection
.
pool
.
db_config
.
database
assert_match
"
test/
db/primary.sqlite3"
,
ActiveRecord
::
Base
.
connection
.
pool
.
db_config
.
database
ensure
ActiveRecord
::
Base
.
configurations
=
@prev_configs
ENV
[
"RAILS_ENV"
]
=
previous_env
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
FileUtils
.
rm_rf
"db"
end
def
test_establish_connection_using_2_level_config_defaults_to_default_env_primary_db
...
...
@@ -135,22 +134,21 @@ def test_establish_connection_using_2_level_config_defaults_to_default_env_prima
config
=
{
"default_env"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
"another_env"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/bad-primary.sqlite3"
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/bad-primary.sqlite3"
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
ActiveRecord
::
Base
.
establish_connection
assert_match
"db/primary.sqlite3"
,
ActiveRecord
::
Base
.
connection
.
pool
.
db_config
.
database
assert_match
"
test/
db/primary.sqlite3"
,
ActiveRecord
::
Base
.
connection
.
pool
.
db_config
.
database
ensure
ActiveRecord
::
Base
.
configurations
=
@prev_configs
ENV
[
"RAILS_ENV"
]
=
previous_env
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
FileUtils
.
rm_rf
"db"
end
def
test_remove_connection_is_deprecated
...
...
@@ -167,28 +165,28 @@ def test_remove_connection_is_deprecated
end
def
test_establish_connection_using_two_level_configurations
config
=
{
"development"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
}
config
=
{
"development"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
@handler
.
establish_connection
(
:development
)
assert_not_nil
pool
=
@handler
.
retrieve_connection_pool
(
"development"
)
assert_equal
"db/primary.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/primary.sqlite3"
,
pool
.
db_config
.
database
ensure
ActiveRecord
::
Base
.
configurations
=
@prev_configs
end
def
test_establish_connection_using_top_level_key_in_two_level_config
config
=
{
"development"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
},
"development_readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/readonly.sqlite3"
}
"development"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
"development_readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/readonly.sqlite3"
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
@handler
.
establish_connection
(
:development_readonly
)
assert_not_nil
pool
=
@handler
.
retrieve_connection_pool
(
"development_readonly"
)
assert_equal
"db/readonly.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/readonly.sqlite3"
,
pool
.
db_config
.
database
ensure
ActiveRecord
::
Base
.
configurations
=
@prev_configs
end
...
...
@@ -199,13 +197,13 @@ def test_symbolized_configurations_assignment
development:
{
primary:
{
adapter:
"sqlite3"
,
database:
"db/development.sqlite3"
,
database:
"
test/
db/development.sqlite3"
,
},
},
test:
{
primary:
{
adapter:
"sqlite3"
,
database:
"db/test.sqlite3"
,
database:
"
test/
db/test.sqlite3"
,
},
},
}
...
...
activerecord/test/cases/connection_adapters/connection_handlers_multi_db_test.rb
浏览文件 @
82a13625
...
...
@@ -90,8 +90,8 @@ def test_establish_connection_using_3_levels_config
config
=
{
"default_env"
=>
{
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/readonly.sqlite3"
,
"replica"
=>
true
},
"default"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/readonly.sqlite3"
,
"replica"
=>
true
},
"default"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
...
...
@@ -99,11 +99,11 @@ def test_establish_connection_using_3_levels_config
ActiveRecord
::
Base
.
connects_to
(
database:
{
writing: :default
,
reading: :readonly
})
assert_not_nil
pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:writing
].
retrieve_connection_pool
(
"ActiveRecord::Base"
)
assert_equal
"db/primary.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/primary.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"default"
,
pool
.
db_config
.
name
assert_not_nil
pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:reading
].
retrieve_connection_pool
(
"ActiveRecord::Base"
)
assert_equal
"db/readonly.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/readonly.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"readonly"
,
pool
.
db_config
.
name
ensure
ActiveRecord
::
Base
.
configurations
=
@prev_configs
...
...
@@ -116,8 +116,8 @@ def test_switching_connections_via_handler
config
=
{
"default_env"
=>
{
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/readonly.sqlite3"
},
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/readonly.sqlite3"
},
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
...
...
@@ -145,7 +145,6 @@ def test_switching_connections_via_handler
ActiveRecord
::
Base
.
configurations
=
@prev_configs
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
ENV
[
"RAILS_ENV"
]
=
previous_env
FileUtils
.
rm_rf
(
"db"
)
end
def
test_establish_connection_using_3_levels_config_with_non_default_handlers
...
...
@@ -153,8 +152,8 @@ def test_establish_connection_using_3_levels_config_with_non_default_handlers
config
=
{
"default_env"
=>
{
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/readonly.sqlite3"
},
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
"readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/readonly.sqlite3"
},
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
...
...
@@ -162,10 +161,10 @@ def test_establish_connection_using_3_levels_config_with_non_default_handlers
ActiveRecord
::
Base
.
connects_to
(
database:
{
default: :primary
,
readonly: :readonly
})
assert_not_nil
pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:default
].
retrieve_connection_pool
(
"ActiveRecord::Base"
)
assert_equal
"db/primary.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/primary.sqlite3"
,
pool
.
db_config
.
database
assert_not_nil
pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:readonly
].
retrieve_connection_pool
(
"ActiveRecord::Base"
)
assert_equal
"db/readonly.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/readonly.sqlite3"
,
pool
.
db_config
.
database
ensure
ActiveRecord
::
Base
.
configurations
=
@prev_configs
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
...
...
@@ -193,7 +192,7 @@ def test_switching_connections_with_database_url
def
test_switching_connections_with_database_config_hash
previous_env
,
ENV
[
"RAILS_ENV"
]
=
ENV
[
"RAILS_ENV"
],
"default_env"
config
=
{
adapter:
"sqlite3"
,
database:
"db/readonly.sqlite3"
}
config
=
{
adapter:
"sqlite3"
,
database:
"
test/
db/readonly.sqlite3"
}
ActiveRecord
::
Base
.
connects_to
(
database:
{
writing:
config
})
assert_equal
:writing
,
ActiveRecord
::
Base
.
current_role
...
...
@@ -230,8 +229,8 @@ def test_switching_connections_with_database_symbol_uses_default_role
config
=
{
"default_env"
=>
{
"animals"
=>
{
adapter:
"sqlite3"
,
database:
"db/animals.sqlite3"
},
"primary"
=>
{
adapter:
"sqlite3"
,
database:
"db/primary.sqlite3"
}
"animals"
=>
{
adapter:
"sqlite3"
,
database:
"
test/
db/animals.sqlite3"
},
"primary"
=>
{
adapter:
"sqlite3"
,
database:
"
test/
db/primary.sqlite3"
}
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
...
...
@@ -256,8 +255,8 @@ def test_switching_connections_with_database_hash_uses_passed_role_and_database
config
=
{
"default_env"
=>
{
"animals"
=>
{
adapter:
"sqlite3"
,
database:
"db/animals.sqlite3"
},
"primary"
=>
{
adapter:
"sqlite3"
,
database:
"db/primary.sqlite3"
}
"animals"
=>
{
adapter:
"sqlite3"
,
database:
"
test/
db/animals.sqlite3"
},
"primary"
=>
{
adapter:
"sqlite3"
,
database:
"
test/
db/primary.sqlite3"
}
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
...
...
@@ -279,7 +278,7 @@ def test_switching_connections_with_database_hash_uses_passed_role_and_database
def
test_connects_to_with_single_configuration
config
=
{
"development"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
},
"development"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
...
...
@@ -296,15 +295,15 @@ def test_connects_to_with_single_configuration
def
test_connects_to_using_top_level_key_in_two_level_config
config
=
{
"development"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
},
"development_readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/readonly.sqlite3"
}
"development"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
"development_readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/readonly.sqlite3"
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
ActiveRecord
::
Base
.
connects_to
database:
{
writing: :development
,
reading: :development_readonly
}
assert_not_nil
pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:reading
].
retrieve_connection_pool
(
"ActiveRecord::Base"
)
assert_equal
"db/readonly.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/readonly.sqlite3"
,
pool
.
db_config
.
database
ensure
ActiveRecord
::
Base
.
configurations
=
@prev_configs
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
...
...
@@ -312,8 +311,8 @@ def test_connects_to_using_top_level_key_in_two_level_config
def
test_connects_to_returns_array_of_established_connections
config
=
{
"development"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
},
"development_readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/readonly.sqlite3"
}
"development"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
"development_readonly"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/readonly.sqlite3"
}
}
@prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
config
...
...
activerecord/test/cases/connection_adapters/connection_handlers_multi_pool_config_test.rb
浏览文件 @
82a13625
...
...
@@ -24,7 +24,7 @@ def test_establish_connection_with_pool_configs
config
=
{
"default_env"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
}
...
...
@@ -52,7 +52,7 @@ def test_remove_connection
config
=
{
"default_env"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
}
...
...
@@ -77,7 +77,7 @@ def test_connected?
config
=
{
"default_env"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
}
...
...
@@ -96,7 +96,6 @@ def test_connected?
ActiveRecord
::
Base
.
configurations
=
@prev_configs
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
ENV
[
"RAILS_ENV"
]
=
previous_env
FileUtils
.
rm_rf
"db"
end
end
end
...
...
activerecord/test/cases/connection_adapters/connection_handlers_sharding_db_test.rb
浏览文件 @
82a13625
...
...
@@ -30,8 +30,8 @@ def test_establish_connection_using_3_levels_config
config
=
{
"default_env"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
},
"primary_shard_one"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary_shard_one.sqlite3"
},
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
"primary_shard_one"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary_shard_one.sqlite3"
},
}
}
...
...
@@ -46,11 +46,11 @@ def test_establish_connection_using_3_levels_config
default_pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:writing
].
retrieve_connection_pool
(
"ActiveRecord::Base"
,
:default
)
assert_equal
base_pool
,
default_pool
assert_equal
"db/primary.sqlite3"
,
default_pool
.
db_config
.
database
assert_equal
"
test/
db/primary.sqlite3"
,
default_pool
.
db_config
.
database
assert_equal
"primary"
,
default_pool
.
db_config
.
name
assert_not_nil
pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:writing
].
retrieve_connection_pool
(
"ActiveRecord::Base"
,
:shard_one
)
assert_equal
"db/primary_shard_one.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/primary_shard_one.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"primary_shard_one"
,
pool
.
db_config
.
name
ensure
ActiveRecord
::
Base
.
configurations
=
@prev_configs
...
...
@@ -63,10 +63,10 @@ def test_establish_connection_using_3_levels_config_with_shards_and_replica
config
=
{
"default_env"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
},
"primary_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
,
"replica"
=>
true
},
"primary_shard_one"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary_shard_one.sqlite3"
},
"primary_shard_one_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary_shard_one.sqlite3"
,
"replica"
=>
true
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
"primary_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
,
"replica"
=>
true
},
"primary_shard_one"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary_shard_one.sqlite3"
},
"primary_shard_one_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary_shard_one.sqlite3"
,
"replica"
=>
true
}
}
}
...
...
@@ -80,21 +80,21 @@ def test_establish_connection_using_3_levels_config_with_shards_and_replica
default_writing_pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:writing
].
retrieve_connection_pool
(
"ActiveRecord::Base"
,
:default
)
base_writing_pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:writing
].
retrieve_connection_pool
(
"ActiveRecord::Base"
)
assert_equal
base_writing_pool
,
default_writing_pool
assert_equal
"db/primary.sqlite3"
,
default_writing_pool
.
db_config
.
database
assert_equal
"
test/
db/primary.sqlite3"
,
default_writing_pool
.
db_config
.
database
assert_equal
"primary"
,
default_writing_pool
.
db_config
.
name
default_reading_pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:reading
].
retrieve_connection_pool
(
"ActiveRecord::Base"
,
:default
)
base_reading_pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:reading
].
retrieve_connection_pool
(
"ActiveRecord::Base"
)
assert_equal
base_reading_pool
,
default_reading_pool
assert_equal
"db/primary.sqlite3"
,
default_reading_pool
.
db_config
.
database
assert_equal
"
test/
db/primary.sqlite3"
,
default_reading_pool
.
db_config
.
database
assert_equal
"primary_replica"
,
default_reading_pool
.
db_config
.
name
assert_not_nil
pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:writing
].
retrieve_connection_pool
(
"ActiveRecord::Base"
,
:shard_one
)
assert_equal
"db/primary_shard_one.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/primary_shard_one.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"primary_shard_one"
,
pool
.
db_config
.
name
assert_not_nil
pool
=
ActiveRecord
::
Base
.
connection_handlers
[
:reading
].
retrieve_connection_pool
(
"ActiveRecord::Base"
,
:shard_one
)
assert_equal
"db/primary_shard_one.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"
test/
db/primary_shard_one.sqlite3"
,
pool
.
db_config
.
database
assert_equal
"primary_shard_one_replica"
,
pool
.
db_config
.
name
ensure
ActiveRecord
::
Base
.
configurations
=
@prev_configs
...
...
@@ -107,10 +107,10 @@ def test_switching_connections_via_handler
config
=
{
"default_env"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
},
"primary_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
,
"replica"
=>
true
},
"primary_shard_one"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary_shard_one.sqlite3"
},
"primary_shard_one_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary_shard_one.sqlite3"
,
"replica"
=>
true
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
"primary_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
,
"replica"
=>
true
},
"primary_shard_one"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary_shard_one.sqlite3"
},
"primary_shard_one_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary_shard_one.sqlite3"
,
"replica"
=>
true
}
}
}
...
...
@@ -168,7 +168,6 @@ def test_switching_connections_via_handler
ActiveRecord
::
Base
.
configurations
=
@prev_configs
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
ENV
[
"RAILS_ENV"
]
=
previous_env
FileUtils
.
rm_rf
(
"db"
)
end
def
test_retrieves_proper_connection_with_nested_connected_to
...
...
@@ -176,10 +175,10 @@ def test_retrieves_proper_connection_with_nested_connected_to
config
=
{
"default_env"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
},
"primary_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
,
"replica"
=>
true
},
"primary_shard_one"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary_shard_one.sqlite3"
},
"primary_shard_one_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary_shard_one.sqlite3"
,
"replica"
=>
true
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
"primary_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
,
"replica"
=>
true
},
"primary_shard_one"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary_shard_one.sqlite3"
},
"primary_shard_one_replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary_shard_one.sqlite3"
,
"replica"
=>
true
}
}
}
...
...
@@ -216,7 +215,6 @@ def test_retrieves_proper_connection_with_nested_connected_to
ActiveRecord
::
Base
.
configurations
=
@prev_configs
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
ENV
[
"RAILS_ENV"
]
=
previous_env
FileUtils
.
rm_rf
(
"db"
)
end
def
test_connected_to_raises_without_a_shard_or_role
...
...
activerecord/test/cases/test_databases_test.rb
浏览文件 @
82a13625
...
...
@@ -9,7 +9,7 @@ def test_databases_are_created
previous_env
,
ENV
[
"RAILS_ENV"
]
=
ENV
[
"RAILS_ENV"
],
"arunit"
prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
{
"arunit"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
}
...
...
@@ -25,14 +25,13 @@ def test_databases_are_created
ActiveRecord
::
Base
.
configurations
=
prev_configs
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
ENV
[
"RAILS_ENV"
]
=
previous_env
FileUtils
.
rm_rf
(
"db"
)
end
def
test_create_databases_after_fork
previous_env
,
ENV
[
"RAILS_ENV"
]
=
ENV
[
"RAILS_ENV"
],
"arunit"
prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
{
"arunit"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
}
...
...
@@ -52,15 +51,14 @@ def test_create_databases_after_fork
ActiveRecord
::
Base
.
configurations
=
prev_configs
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
ENV
[
"RAILS_ENV"
]
=
previous_env
FileUtils
.
rm_rf
(
"db"
)
end
def
test_order_of_configurations_isnt_changed_by_test_databases
previous_env
,
ENV
[
"RAILS_ENV"
]
=
ENV
[
"RAILS_ENV"
],
"arunit"
prev_configs
,
ActiveRecord
::
Base
.
configurations
=
ActiveRecord
::
Base
.
configurations
,
{
"arunit"
=>
{
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
},
"replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"db/primary.sqlite3"
}
"primary"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
},
"replica"
=>
{
"adapter"
=>
"sqlite3"
,
"database"
=>
"
test/
db/primary.sqlite3"
}
}
}
...
...
@@ -76,7 +74,6 @@ def test_order_of_configurations_isnt_changed_by_test_databases
ActiveRecord
::
Base
.
configurations
=
prev_configs
ActiveRecord
::
Base
.
establish_connection
(
:arunit
)
ENV
[
"RAILS_ENV"
]
=
previous_env
FileUtils
.
rm_rf
(
"db"
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录