diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-07-04 13:17:00 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-04 13:17:00 -0400 | 
| commit | c2486008d190bbf9f33e5e3c14e187aafb4b2657 (patch) | |
| tree | 724484807283e174a847f077a3b91d1c2c057d9b | |
| parent | 6f2b0eb44ab166f98f3bc4a3aa09d3b899e0fd62 (diff) | |
| parent | 2568414f49cc74522569941004104289d0175e72 (diff) | |
| download | rails-c2486008d190bbf9f33e5e3c14e187aafb4b2657.tar.gz rails-c2486008d190bbf9f33e5e3c14e187aafb4b2657.tar.bz2 rails-c2486008d190bbf9f33e5e3c14e187aafb4b2657.zip | |
Merge pull request #29666 from kamipo/deprecate_database_specific_json_types
Deprecate database specific JSON types
3 files changed, 0 insertions, 14 deletions
| 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 caa125576c..c15b4a1a05 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -854,9 +854,6 @@ module ActiveRecord            end          end -        class MysqlJson < Type::Json # :nodoc: -        end -          class MysqlString < Type::String # :nodoc:            def serialize(value)              case value diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb index 0e8888a2b7..6666622c08 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid.rb @@ -8,7 +8,6 @@ require_relative "oid/decimal"  require_relative "oid/enum"  require_relative "oid/hstore"  require_relative "oid/inet" -require_relative "oid/json"  require_relative "oid/jsonb"  require_relative "oid/money"  require_relative "oid/oid" diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb deleted file mode 100644 index 3c706c27c4..0000000000 --- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb +++ /dev/null @@ -1,10 +0,0 @@ -module ActiveRecord -  module ConnectionAdapters -    module PostgreSQL -      module OID # :nodoc: -        class Json < Type::Json # :nodoc: -        end -      end -    end -  end -end | 
