aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-08-21 00:44:50 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-08-21 00:44:50 +0900
commit8170419b0a0e7abbfb2c64c84f641c0a39c163d0 (patch)
treec22309324058b8114786801ac5a7f0c20cb701a0 /activerecord/lib/active_record/connection_adapters/mysql
parentdcf7fc1047946e6759c8346a331718e5555f04f1 (diff)
downloadrails-8170419b0a0e7abbfb2c64c84f641c0a39c163d0.tar.gz
rails-8170419b0a0e7abbfb2c64c84f641c0a39c163d0.tar.bz2
rails-8170419b0a0e7abbfb2c64c84f641c0a39c163d0.zip
Don't expose `prepare_column_options`
This is only used for the internal `column_spec` and `column_spec_for_primary_key`.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb25
1 files changed, 12 insertions, 13 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 fbe3596dda..81f7dce562 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb
@@ -4,24 +4,23 @@ module ActiveRecord
module ConnectionAdapters
module MySQL
module ColumnDumper # :nodoc:
- def prepare_column_options(column)
- spec = super
- spec[:unsigned] = "true" if column.unsigned?
-
- if supports_virtual_columns? && column.virtual?
- spec[:as] = extract_expression_for_virtual_column(column)
- spec[:stored] = "true" if /\b(?:STORED|PERSISTENT)\b/.match?(column.extra)
- spec = { type: schema_type(column).inspect }.merge!(spec)
- end
-
- spec
- end
-
def migration_keys
super + [:unsigned]
end
private
+ def prepare_column_options(column)
+ spec = super
+ spec[:unsigned] = "true" if column.unsigned?
+
+ if supports_virtual_columns? && column.virtual?
+ spec[:as] = extract_expression_for_virtual_column(column)
+ spec[:stored] = "true" if /\b(?:STORED|PERSISTENT)\b/.match?(column.extra)
+ spec = { type: schema_type(column).inspect }.merge!(spec)
+ end
+
+ spec
+ end
def default_primary_key?(column)
super && column.auto_increment? && !column.unsigned?