diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-06-02 04:43:08 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-10-05 17:38:07 +0900 |
| commit | 563c16c7cbccc2f3a088139bfb855865a51b027e (patch) | |
| tree | 101561dd7e69065f482ea1f0c9a7fbf98eaaf11b /activerecord/lib/active_record | |
| parent | 214dc7d82d8a87914d5d426b7e8460300000acc2 (diff) | |
| download | rails-563c16c7cbccc2f3a088139bfb855865a51b027e.tar.gz rails-563c16c7cbccc2f3a088139bfb855865a51b027e.tar.bz2 rails-563c16c7cbccc2f3a088139bfb855865a51b027e.zip | |
Add JSON attribute test cases for SQLite3 adapter
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 8c889f98f5..6859feb2f3 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -478,6 +478,8 @@ module ActiveRecord m.alias_type %r(number)i, "decimal" m.alias_type %r(double)i, "float" + m.register_type %r(^json)i, Type::Json.new + m.register_type(%r(decimal)i) do |sql_type| scale = extract_scale(sql_type) precision = extract_precision(sql_type) diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index ae991d3d79..add6f8632b 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -563,7 +563,6 @@ module ActiveRecord m.register_type %r(longblob)i, Type::Binary.new(limit: 2**32 - 1) m.register_type %r(^float)i, Type::Float.new(limit: 24) m.register_type %r(^double)i, Type::Float.new(limit: 53) - m.register_type %r(^json)i, Type::Json.new register_integer_type m, %r(^bigint)i, limit: 8 register_integer_type m, %r(^int)i, limit: 4 |