aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-02-06 17:28:17 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-02-06 23:14:41 +0900
commitd9bdc2f9ef44c8d24b8d331b55e5878cd211542f (patch)
treef22487dc6436a5bedaf4c4319ff35161a1d12b67 /activerecord
parentb9a95456a5f73dd113c6656cdc447f0b3db4c737 (diff)
downloadrails-d9bdc2f9ef44c8d24b8d331b55e5878cd211542f.tar.gz
rails-d9bdc2f9ef44c8d24b8d331b55e5878cd211542f.tar.bz2
rails-d9bdc2f9ef44c8d24b8d331b55e5878cd211542f.zip
MariaDB does not support JSON type
Fixes #22980.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb2
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 ===========================================