aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-11-28 11:13:26 +0100
committerYves Senn <yves.senn@gmail.com>2014-11-28 11:13:26 +0100
commitf2d602b229134f6fa0ce693bdaa76c7f8e2521d5 (patch)
treee3b57121a819e4b6298b470d43ed03babd36b5a2 /activerecord/lib/active_record
parent6c83d4bfd5e33bde5d659fcbe6f28bfe80d8eb4a (diff)
parent9e6733d5f7867717c760c1cf4b70c36318c28d67 (diff)
downloadrails-f2d602b229134f6fa0ce693bdaa76c7f8e2521d5.tar.gz
rails-f2d602b229134f6fa0ce693bdaa76c7f8e2521d5.tar.bz2
rails-f2d602b229134f6fa0ce693bdaa76c7f8e2521d5.zip
Merge pull request #17798 from kamipo/refactor_visit_add_column
Refactor `SchemaCreation#visit_AddColumn`
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb4
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb6
2 files changed, 1 insertions, 9 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 6bab260f5a..792d49da6f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
@@ -15,9 +15,7 @@ module ActiveRecord
end
def visit_AddColumn(o)
- sql_type = type_to_sql(o.type, o.limit, o.precision, o.scale)
- sql = "ADD #{quote_column_name(o.name)} #{sql_type}"
- add_column_options!(sql, column_options(o))
+ "ADD #{accept(o)}"
end
private
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
index 193c950261..dba905ed56 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -4,12 +4,6 @@ module ActiveRecord
class SchemaCreation < AbstractAdapter::SchemaCreation
private
- def visit_AddColumn(o)
- sql_type = type_to_sql(o.type, o.limit, o.precision, o.scale)
- sql = "ADD COLUMN #{quote_column_name(o.name)} #{sql_type}"
- add_column_options!(sql, column_options(o))
- end
-
def visit_ColumnDefinition(o)
sql = super
if o.primary_key? && o.type != :primary_key