kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #18319 from kamipo/sql_type_has_been_determined

Browse source 
`sql_type` has been determined already when quoting defaults
This commit is contained in:
Rafael Mendonça França 2015-01-04 00:00:52 -03:00
commit 2d9b9fb5b5
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
View file

@ -28,8 +28,8 @@ module ActiveRecord
end
def visit_ColumnDefinition(o)
sql_type = type_to_sql(o.type, o.limit, o.precision, o.scale)
column_sql = "#{quote_column_name(o.name)} #{sql_type}"
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
end
@ -98,9 +98,7 @@ module ActiveRecord
end
def quote_default_expression(value, column)
column.sql_type ||= type_to_sql(column.type, column.limit, column.precision, column.scale)
value = type_for_column(column).type_cast_for_database(value)
@conn.quote(value)
end