Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
63ace8fc
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,发现更多精彩内容 >>
提交
63ace8fc
编写于
6月 05, 2019
作者:
R
Ryuta Kamizono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge pull request #36404 from mrschuster/sqlite3_collation_bug
Fix sqlite3 collation parsing when using decimal columns.
上级
765403c7
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
15 addition
and
2 deletion
+15
-2
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+4
-0
activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
.../lib/active_record/connection_adapters/sqlite3_adapter.rb
+2
-2
activerecord/test/cases/adapters/sqlite3/collation_test.rb
activerecord/test/cases/adapters/sqlite3/collation_test.rb
+9
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
63ace8fc
*
Fix sqlite3 collation parsing when using decimal columns.
*Martin R. Schuster*
*
Make ActiveRecord
`ConnectionPool.connections`
method thread-safe.
*
Make ActiveRecord
`ConnectionPool.connections`
method thread-safe.
Fixes #36465.
Fixes #36465.
...
...
activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
浏览文件 @
63ace8fc
...
@@ -525,9 +525,9 @@ def table_structure_with_collation(table_name, basic_structure)
...
@@ -525,9 +525,9 @@ def table_structure_with_collation(table_name, basic_structure)
result
=
exec_query
(
sql
,
"SCHEMA"
).
first
result
=
exec_query
(
sql
,
"SCHEMA"
).
first
if
result
if
result
# Splitting with left parentheses and
picking up las
t will return all
# Splitting with left parentheses and
discarding the first par
t will return all
# columns separated with comma(,).
# columns separated with comma(,).
columns_string
=
result
[
"sql"
].
split
(
"("
).
last
columns_string
=
result
[
"sql"
].
split
(
"("
,
2
).
last
columns_string
.
split
(
","
).
each
do
|
column_string
|
columns_string
.
split
(
","
).
each
do
|
column_string
|
# This regex will match the column name and collation type and will save
# This regex will match the column name and collation type and will save
...
...
activerecord/test/cases/adapters/sqlite3/collation_test.rb
浏览文件 @
63ace8fc
...
@@ -11,6 +11,10 @@ def setup
...
@@ -11,6 +11,10 @@ def setup
@connection
.
create_table
:collation_table_sqlite3
,
force:
true
do
|
t
|
@connection
.
create_table
:collation_table_sqlite3
,
force:
true
do
|
t
|
t
.
string
:string_nocase
,
collation:
"NOCASE"
t
.
string
:string_nocase
,
collation:
"NOCASE"
t
.
text
:text_rtrim
,
collation:
"RTRIM"
t
.
text
:text_rtrim
,
collation:
"RTRIM"
# The decimal column might interfere with collation parsing.
# Thus, add this column type and some other string column afterwards.
t
.
decimal
:decimal_col
,
precision:
6
,
scale:
2
t
.
string
:string_after_decimal_nocase
,
collation:
"NOCASE"
end
end
end
end
...
@@ -22,6 +26,11 @@ def teardown
...
@@ -22,6 +26,11 @@ def teardown
column
=
@connection
.
columns
(
:collation_table_sqlite3
).
find
{
|
c
|
c
.
name
==
"string_nocase"
}
column
=
@connection
.
columns
(
:collation_table_sqlite3
).
find
{
|
c
|
c
.
name
==
"string_nocase"
}
assert_equal
:string
,
column
.
type
assert_equal
:string
,
column
.
type
assert_equal
"NOCASE"
,
column
.
collation
assert_equal
"NOCASE"
,
column
.
collation
# Verify collation of a column behind the decimal column as well.
column
=
@connection
.
columns
(
:collation_table_sqlite3
).
find
{
|
c
|
c
.
name
==
"string_after_decimal_nocase"
}
assert_equal
:string
,
column
.
type
assert_equal
"NOCASE"
,
column
.
collation
end
end
test
"text column with collation"
do
test
"text column with collation"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录