aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2015-01-30 14:25:52 +0900
committerRyuta Kamizono <kamipo@gmail.com>2015-02-08 19:09:04 +0900
commitb199012c4f01693f18e2143f43c1bf928bae1860 (patch)
tree32dfddb4ea32bad101c8a5ffae398c1fb99e597d /activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
parent1492e83e49f74b1d874585000bad5368d9f09218 (diff)
downloadrails-b199012c4f01693f18e2143f43c1bf928bae1860.tar.gz
rails-b199012c4f01693f18e2143f43c1bf928bae1860.tar.bz2
rails-b199012c4f01693f18e2143f43c1bf928bae1860.zip
An array type is a part of `sql_type`
`sql_type` is reused in `lookup_cast_type`. If making it a part of `sql_type` when handled array option first, it isn't necessary to do again.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
index db20b60d60..81f8615976 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
@@ -28,7 +28,7 @@ module ActiveRecord
end
def visit_ColumnDefinition(o)
- o.sql_type = type_to_sql(o.type, o.limit, o.precision, o.scale)
+ o.sql_type ||= type_to_sql(o.type, o.limit, o.precision, o.scale)
column_sql = "#{quote_column_name(o.name)} #{o.sql_type}"
add_column_options!(column_sql, column_options(o)) unless o.type == :primary_key
column_sql