aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-02-03 08:50:46 +0900
committerJeremy Daer <jeremydaer@gmail.com>2017-02-09 00:30:29 -0700
commitae39b1a03d0a859be9d5342592c8936f89fcbacf (patch)
tree510e3d0ac891b035676656325b0e2f0be7bd08ec /activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb
parente2b425bc741d19308f98fed1103bf7d66c8cad2d (diff)
downloadrails-ae39b1a03d0a859be9d5342592c8936f89fcbacf.tar.gz
rails-ae39b1a03d0a859be9d5342592c8936f89fcbacf.tar.bz2
rails-ae39b1a03d0a859be9d5342592c8936f89fcbacf.zip
Refactor `ColumnDefinition` to contain `options` hash
Column options are passed as an hash args then used as `options` hash in `add_column_options!`. Converting args to attributes is inconvinient for using options as an hash.
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.rb14
1 files changed, 1 insertions, 13 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 39c2acbca9..e8358271ab 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_creation.rb
@@ -1,7 +1,7 @@
module ActiveRecord
module ConnectionAdapters
module MySQL
- class SchemaCreation < AbstractAdapter::SchemaCreation
+ class SchemaCreation < AbstractAdapter::SchemaCreation # :nodoc:
delegate :add_sql_comment!, :mariadb?, to: :@conn
private :add_sql_comment!, :mariadb?
@@ -11,11 +11,6 @@ module ActiveRecord
"DROP FOREIGN KEY #{name}"
end
- def visit_ColumnDefinition(o)
- o.sql_type = type_to_sql(o.type, o.limit, o.precision, o.scale, o.unsigned)
- super
- end
-
def visit_AddColumnDefinition(o)
add_column_position!(super, column_options(o.column))
end
@@ -29,13 +24,6 @@ module ActiveRecord
add_sql_comment!(super, options[:comment])
end
- def column_options(o)
- column_options = super
- column_options[:charset] = o.charset
- column_options[:stored] = o.stored
- column_options
- end
-
def add_column_options!(sql, options)
if charset = options[:charset]
sql << " CHARACTER SET #{charset}"