diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-06 14:44:45 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-06 14:44:45 -0700 |
| commit | 8526e9bed21a119266e886c3316d3fe10c9af5ce (patch) | |
| tree | 417bb2c4c0e205cd41b4a6125a2418857012555c /activerecord | |
| parent | 4e4bcae0841b81438ce3b6c627eebc7536566bf5 (diff) | |
| parent | d9bdc2f9ef44c8d24b8d331b55e5878cd211542f (diff) | |
| download | rails-8526e9bed21a119266e886c3316d3fe10c9af5ce.tar.gz rails-8526e9bed21a119266e886c3316d3fe10c9af5ce.tar.bz2 rails-8526e9bed21a119266e886c3316d3fe10c9af5ce.zip | |
Merge pull request #23519 from kamipo/mariadb_does_not_support_json_type
MariaDB does not support JSON type
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index c3c5b660fd..23b33a3555 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -42,7 +42,7 @@ module ActiveRecord end def supports_json? - version >= '5.7.8' + !mariadb? && version >= '5.7.8' end # HELPER METHODS =========================================== |