aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-07-07 09:32:01 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-07-07 09:32:01 +0900
commitf4e2807a1a72873af5630fa19888ea5bd61aaafa (patch)
tree8582a200bfa8fd18b9e2307e3b93b009b7772cc9 /activerecord/lib
parentc9b514cd3e8fe7d74ae91ecd30db839132e7899c (diff)
downloadrails-f4e2807a1a72873af5630fa19888ea5bd61aaafa.tar.gz
rails-f4e2807a1a72873af5630fa19888ea5bd61aaafa.tar.bz2
rails-f4e2807a1a72873af5630fa19888ea5bd61aaafa.zip
Use `information_schema` to extract `generation_expression` for MariaDB
Since MariaDB 10.2.5, `information_schema` supports Virtual Columns. Fixes #29670.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb2
1 files changed, 1 insertions, 1 deletions
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 \((?<expression>.+?)\) #{column.extra}/ =~ create_table_info
$~[:expression].inspect