aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-12-06 08:33:16 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-12-06 08:42:51 +0900
commitd721344280346f67c7d2dbffa9eaf9341e73673d (patch)
tree3979cb5fb0dbc3ceb8fe19f71302794153b32381 /activerecord/test
parentd2321aacc7451f6b4f154d894adcb76820abba3c (diff)
downloadrails-d721344280346f67c7d2dbffa9eaf9341e73673d.tar.gz
rails-d721344280346f67c7d2dbffa9eaf9341e73673d.tar.bz2
rails-d721344280346f67c7d2dbffa9eaf9341e73673d.zip
Use `:string` instead of `:text` for `JsonAttributeTest`
Since CLOB data type has many limitations in Oracle SELECT WHERE clause.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/json_attribute_test.rb6
-rw-r--r--activerecord/test/cases/json_shared_test_cases.rb9
2 files changed, 10 insertions, 5 deletions
diff --git a/activerecord/test/cases/json_attribute_test.rb b/activerecord/test/cases/json_attribute_test.rb
index 63f3c77fc3..afc39d0420 100644
--- a/activerecord/test/cases/json_attribute_test.rb
+++ b/activerecord/test/cases/json_attribute_test.rb
@@ -19,14 +19,14 @@ class JsonAttributeTest < ActiveRecord::TestCase
def setup
super
@connection.create_table("json_data_type") do |t|
- t.text "payload"
- t.text "settings"
+ t.string "payload"
+ t.string "settings"
end
end
private
def column_type
- :text
+ :string
end
def klass
diff --git a/activerecord/test/cases/json_shared_test_cases.rb b/activerecord/test/cases/json_shared_test_cases.rb
index 56ec8c8a82..012aaffde1 100644
--- a/activerecord/test/cases/json_shared_test_cases.rb
+++ b/activerecord/test/cases/json_shared_test_cases.rb
@@ -23,7 +23,7 @@ module JSONSharedTestCases
def test_column
column = klass.columns_hash["payload"]
assert_equal column_type, column.type
- assert_equal column_type.to_s, column.sql_type
+ assert_type_match column_type, column.sql_type
type = klass.type_for_attribute("payload")
assert_not type.binary?
@@ -36,7 +36,7 @@ module JSONSharedTestCases
klass.reset_column_information
column = klass.columns_hash["users"]
assert_equal column_type, column.type
- assert_equal column_type.to_s, column.sql_type
+ assert_type_match column_type, column.sql_type
end
def test_schema_dumping
@@ -253,4 +253,9 @@ module JSONSharedTestCases
def klass
JsonDataType
end
+
+ def assert_type_match(type, sql_type)
+ native_type = ActiveRecord::Base.connection.native_database_types[type][:name]
+ assert_match %r(\A#{native_type}\b), sql_type
+ end
end