aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/type.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-03-07 16:42:14 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-05-30 18:26:03 +0900
commit1c4be603c121a8853a4f1d6c13cb91f9b66bef9e (patch)
treeb189e2cc2c8a1eaaa35b605e910818971b6208f0 /activerecord/lib/active_record/type.rb
parent5d9d6a4fbf72029266bfa643929a9a80f9286fbe (diff)
downloadrails-1c4be603c121a8853a4f1d6c13cb91f9b66bef9e.tar.gz
rails-1c4be603c121a8853a4f1d6c13cb91f9b66bef9e.tar.bz2
rails-1c4be603c121a8853a4f1d6c13cb91f9b66bef9e.zip
Consolidate database specific JSON types to `Type::Json`
Diffstat (limited to 'activerecord/lib/active_record/type.rb')
-rw-r--r--activerecord/lib/active_record/type.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/type.rb b/activerecord/lib/active_record/type.rb
index 4f632660a8..9ed6c95bf9 100644
--- a/activerecord/lib/active_record/type.rb
+++ b/activerecord/lib/active_record/type.rb
@@ -1,11 +1,11 @@
require "active_model/type"
-require "active_record/type/internal/abstract_json"
require "active_record/type/internal/timezone"
require "active_record/type/date"
require "active_record/type/date_time"
require "active_record/type/decimal_without_scale"
+require "active_record/type/json"
require "active_record/type/time"
require "active_record/type/text"
require "active_record/type/unsigned_integer"
@@ -69,6 +69,7 @@ module ActiveRecord
register(:decimal, Type::Decimal, override: false)
register(:float, Type::Float, override: false)
register(:integer, Type::Integer, override: false)
+ register(:json, Type::Json, override: false)
register(:string, Type::String, override: false)
register(:text, Type::Text, override: false)
register(:time, Type::Time, override: false)