Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
09206716
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 搜索 >>
提交
09206716
编写于
7月 07, 2014
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16074 from sgrif/sg-remove-text-predicate
Remove the `text?` predicate from the type objects
上级
18697882
35592307
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
4 addition
and
32 deletion
+4
-32
activerecord/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb
.../connection_adapters/postgresql/oid/specialized_string.rb
+0
-4
activerecord/lib/active_record/type/string.rb
activerecord/lib/active_record/type/string.rb
+0
-4
activerecord/lib/active_record/type/value.rb
activerecord/lib/active_record/type/value.rb
+0
-4
activerecord/lib/active_record/validations/uniqueness.rb
activerecord/lib/active_record/validations/uniqueness.rb
+4
-2
activerecord/test/cases/adapters/postgresql/array_test.rb
activerecord/test/cases/adapters/postgresql/array_test.rb
+0
-1
activerecord/test/cases/adapters/postgresql/bit_string_test.rb
...erecord/test/cases/adapters/postgresql/bit_string_test.rb
+0
-2
activerecord/test/cases/adapters/postgresql/citext_test.rb
activerecord/test/cases/adapters/postgresql/citext_test.rb
+0
-1
activerecord/test/cases/adapters/postgresql/composite_test.rb
...verecord/test/cases/adapters/postgresql/composite_test.rb
+0
-2
activerecord/test/cases/adapters/postgresql/domain_test.rb
activerecord/test/cases/adapters/postgresql/domain_test.rb
+0
-1
activerecord/test/cases/adapters/postgresql/enum_test.rb
activerecord/test/cases/adapters/postgresql/enum_test.rb
+0
-1
activerecord/test/cases/adapters/postgresql/full_text_test.rb
...verecord/test/cases/adapters/postgresql/full_text_test.rb
+0
-1
activerecord/test/cases/adapters/postgresql/geometric_test.rb
...verecord/test/cases/adapters/postgresql/geometric_test.rb
+0
-1
activerecord/test/cases/adapters/postgresql/hstore_test.rb
activerecord/test/cases/adapters/postgresql/hstore_test.rb
+0
-1
activerecord/test/cases/adapters/postgresql/json_test.rb
activerecord/test/cases/adapters/postgresql/json_test.rb
+0
-1
activerecord/test/cases/adapters/postgresql/ltree_test.rb
activerecord/test/cases/adapters/postgresql/ltree_test.rb
+0
-1
activerecord/test/cases/adapters/postgresql/money_test.rb
activerecord/test/cases/adapters/postgresql/money_test.rb
+0
-1
activerecord/test/cases/adapters/postgresql/network_test.rb
activerecord/test/cases/adapters/postgresql/network_test.rb
+0
-3
activerecord/test/cases/adapters/postgresql/uuid_test.rb
activerecord/test/cases/adapters/postgresql/uuid_test.rb
+0
-1
未找到文件。
activerecord/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb
浏览文件 @
09206716
...
...
@@ -8,10 +8,6 @@ class SpecializedString < Type::String # :nodoc:
def
initialize
(
type
)
@type
=
type
end
def
text?
false
end
end
end
end
...
...
activerecord/lib/active_record/type/string.rb
浏览文件 @
09206716
...
...
@@ -5,10 +5,6 @@ def type
:string
end
def
text?
true
end
def
changed_in_place?
(
raw_old_value
,
new_value
)
if
new_value
.
is_a?
(
::
String
)
raw_old_value
!=
new_value
...
...
activerecord/lib/active_record/type/value.rb
浏览文件 @
09206716
...
...
@@ -50,10 +50,6 @@ def type_cast_for_schema(value) # :nodoc:
# These predicates are not documented, as I need to look further into
# their use, and see if they can be removed entirely.
def
text?
# :nodoc:
false
end
def
number?
# :nodoc:
false
end
...
...
activerecord/lib/active_record/validations/uniqueness.rb
浏览文件 @
09206716
...
...
@@ -61,9 +61,11 @@ def build_relation(klass, table, attribute, value) #:nodoc:
column
=
klass
.
columns_hash
[
attribute_name
]
value
=
klass
.
connection
.
type_cast
(
value
,
column
)
value
=
value
.
to_s
[
0
,
column
.
limit
]
if
value
&&
column
.
limit
&&
column
.
text?
if
value
.
is_a?
(
String
)
&&
column
.
limit
value
=
value
.
to_s
[
0
,
column
.
limit
]
end
if
!
options
[
:case_sensitive
]
&&
value
&&
column
.
text?
if
!
options
[
:case_sensitive
]
&&
value
.
is_a?
(
String
)
# will use SQL LOWER function before comparison, unless it detects a case insensitive collation
klass
.
connection
.
case_insensitive_comparison
(
table
,
attribute
,
column
,
value
)
else
...
...
activerecord/test/cases/adapters/postgresql/array_test.rb
浏览文件 @
09206716
...
...
@@ -38,7 +38,6 @@ def test_column
assert_equal
:string
,
@column
.
type
assert_equal
"character varying"
,
@column
.
sql_type
assert
@column
.
array
assert_not
@column
.
text?
assert_not
@column
.
number?
assert_not
@column
.
binary?
...
...
activerecord/test/cases/adapters/postgresql/bit_string_test.rb
浏览文件 @
09206716
...
...
@@ -26,7 +26,6 @@ def test_bit_string_column
column
=
PostgresqlBitString
.
columns_hash
[
"a_bit"
]
assert_equal
:bit
,
column
.
type
assert_equal
"bit(8)"
,
column
.
sql_type
assert_not
column
.
text?
assert_not
column
.
number?
assert_not
column
.
binary?
assert_not
column
.
array
...
...
@@ -36,7 +35,6 @@ def test_bit_string_varying_column
column
=
PostgresqlBitString
.
columns_hash
[
"a_bit_varying"
]
assert_equal
:bit_varying
,
column
.
type
assert_equal
"bit varying(4)"
,
column
.
sql_type
assert_not
column
.
text?
assert_not
column
.
number?
assert_not
column
.
binary?
assert_not
column
.
array
...
...
activerecord/test/cases/adapters/postgresql/citext_test.rb
浏览文件 @
09206716
...
...
@@ -35,7 +35,6 @@ def test_column
column
=
Citext
.
columns_hash
[
'cival'
]
assert_equal
:citext
,
column
.
type
assert_equal
'citext'
,
column
.
sql_type
assert_not
column
.
text?
assert_not
column
.
number?
assert_not
column
.
binary?
assert_not
column
.
array
...
...
activerecord/test/cases/adapters/postgresql/composite_test.rb
浏览文件 @
09206716
...
...
@@ -51,7 +51,6 @@ def test_column
assert_nil
column
.
type
assert_equal
"full_address"
,
column
.
sql_type
assert_not
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
@@ -113,7 +112,6 @@ def test_column
assert_equal
:full_address
,
column
.
type
assert_equal
"full_address"
,
column
.
sql_type
assert_not
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
activerecord/test/cases/adapters/postgresql/domain_test.rb
浏览文件 @
09206716
...
...
@@ -30,7 +30,6 @@ def test_column
assert_equal
:decimal
,
column
.
type
assert_equal
"custom_money"
,
column
.
sql_type
assert
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
activerecord/test/cases/adapters/postgresql/enum_test.rb
浏览文件 @
09206716
...
...
@@ -34,7 +34,6 @@ def test_column
assert_equal
:enum
,
column
.
type
assert_equal
"mood"
,
column
.
sql_type
assert_not
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
activerecord/test/cases/adapters/postgresql/full_text_test.rb
浏览文件 @
09206716
...
...
@@ -9,7 +9,6 @@ def test_tsvector_column
assert_equal
:tsvector
,
column
.
type
assert_equal
"tsvector"
,
column
.
sql_type
assert_not
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
activerecord/test/cases/adapters/postgresql/geometric_test.rb
浏览文件 @
09206716
...
...
@@ -28,7 +28,6 @@ def test_column
column
=
PostgresqlPoint
.
columns_hash
[
"x"
]
assert_equal
:point
,
column
.
type
assert_equal
"point"
,
column
.
sql_type
assert_not
column
.
text?
assert_not
column
.
number?
assert_not
column
.
binary?
assert_not
column
.
array
...
...
activerecord/test/cases/adapters/postgresql/hstore_test.rb
浏览文件 @
09206716
...
...
@@ -56,7 +56,6 @@ def test_column
assert_equal
:hstore
,
@column
.
type
assert_equal
"hstore"
,
@column
.
sql_type
assert_not
@column
.
number?
assert_not
@column
.
text?
assert_not
@column
.
binary?
assert_not
@column
.
array
end
...
...
activerecord/test/cases/adapters/postgresql/json_test.rb
浏览文件 @
09206716
...
...
@@ -35,7 +35,6 @@ def test_column
assert_equal
:json
,
column
.
type
assert_equal
"json"
,
column
.
sql_type
assert_not
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
activerecord/test/cases/adapters/postgresql/ltree_test.rb
浏览文件 @
09206716
...
...
@@ -31,7 +31,6 @@ def test_column
assert_equal
:ltree
,
column
.
type
assert_equal
"ltree"
,
column
.
sql_type
assert_not
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
activerecord/test/cases/adapters/postgresql/money_test.rb
浏览文件 @
09206716
...
...
@@ -26,7 +26,6 @@ def test_column
assert_equal
"money"
,
column
.
sql_type
assert_equal
2
,
column
.
scale
assert
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
activerecord/test/cases/adapters/postgresql/network_test.rb
浏览文件 @
09206716
...
...
@@ -10,7 +10,6 @@ def test_cidr_column
assert_equal
:cidr
,
column
.
type
assert_equal
"cidr"
,
column
.
sql_type
assert_not
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
@@ -20,7 +19,6 @@ def test_inet_column
assert_equal
:inet
,
column
.
type
assert_equal
"inet"
,
column
.
sql_type
assert_not
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
@@ -30,7 +28,6 @@ def test_macaddr_column
assert_equal
:macaddr
,
column
.
type
assert_equal
"macaddr"
,
column
.
sql_type
assert_not
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
activerecord/test/cases/adapters/postgresql/uuid_test.rb
浏览文件 @
09206716
...
...
@@ -51,7 +51,6 @@ def test_data_type_of_uuid_types
assert_equal
:uuid
,
column
.
type
assert_equal
"uuid"
,
column
.
sql_type
assert_not
column
.
number?
assert_not
column
.
text?
assert_not
column
.
binary?
assert_not
column
.
array
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录