aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2015-12-15 05:26:14 +0900
committerJeremy Daer <jeremydaer@gmail.com>2017-02-01 22:13:46 -0700
commit65bf1c60053e727835e06392d27a2fb49665484c (patch)
tree02a5a5b0cead003b2d24c2419585748830b4416e /activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb
parentc98e08df7a303f4c7d6d37aa638d4ce97bb1ec9c (diff)
downloadrails-65bf1c60053e727835e06392d27a2fb49665484c.tar.gz
rails-65bf1c60053e727835e06392d27a2fb49665484c.tar.bz2
rails-65bf1c60053e727835e06392d27a2fb49665484c.zip
Virtual/generated column support for MySQL 5.7.5+ and MariaDB 5.2.0+
MySQL generated columns: https://dev.mysql.com/doc/refman/5.7/en/create-table-generated-columns.html MariaDB virtual columns: https://mariadb.com/kb/en/mariadb/virtual-computed-columns/ Declare virtual columns with `t.virtual name, type: …, as: "expression"`. Pass `stored: true` to persist the generated value (false by default). Example: create_table :generated_columns do |t| t.string :name t.virtual :upper_name, type: :string, as: "UPPER(name)" t.virtual :name_length, type: :integer, as: "LENGTH(name)", stored: true t.index :name_length # May be indexed, too! end Closes #22589
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb b/activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb
index d808b50332..39c2acbca9 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb
@@ -2,8 +2,8 @@ module ActiveRecord
module ConnectionAdapters
module MySQL
class SchemaCreation < AbstractAdapter::SchemaCreation
- delegate :add_sql_comment!, to: :@conn
- private :add_sql_comment!
+ delegate :add_sql_comment!, :mariadb?, to: :@conn
+ private :add_sql_comment!, :mariadb?
private
@@ -32,6 +32,7 @@ module ActiveRecord
def column_options(o)
column_options = super
column_options[:charset] = o.charset
+ column_options[:stored] = o.stored
column_options
end
@@ -44,6 +45,13 @@ module ActiveRecord
sql << " COLLATE #{collation}"
end
+ if as = options[:as]
+ sql << " AS (#{as})"
+ if options[:stored]
+ sql << (mariadb? ? " PERSISTENT" : " STORED")
+ end
+ end
+
add_sql_comment!(super, options[:comment])
end