From f4e2807a1a72873af5630fa19888ea5bd61aaafa Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Fri, 7 Jul 2017 09:32:01 +0900 Subject: Use `information_schema` to extract `generation_expression` for MariaDB Since MariaDB 10.2.5, `information_schema` supports Virtual Columns. Fixes #29670. --- .../lib/active_record/connection_adapters/mysql/schema_dumper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/connection_adapters') diff --git a/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb index eff96e329f..a46d9f8cbb 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb @@ -53,7 +53,7 @@ module ActiveRecord end def extract_expression_for_virtual_column(column) - if mariadb? + if mariadb? && version < "10.2.5" create_table_info = create_table_info(column.table_name) if %r/#{quote_column_name(column.name)} #{Regexp.quote(column.sql_type)}(?: COLLATE \w+)? AS \((?.+?)\) #{column.extra}/ =~ create_table_info $~[:expression].inspect -- cgit v1.2.3