aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2014-11-28 17:30:55 +0900
committerRyuta Kamizono <kamipo@gmail.com>2014-11-28 17:30:55 +0900
commit66cc7ce67c4f48f62377ad1a972581c35bcc8373 (patch)
tree9255bbb6af11a2bc5bc73092c199df7235ecd05e
parent91fca372b14b553a8029d81213ff51c8f3cde39b (diff)
downloadrails-66cc7ce67c4f48f62377ad1a972581c35bcc8373.tar.gz
rails-66cc7ce67c4f48f62377ad1a972581c35bcc8373.tar.bz2
rails-66cc7ce67c4f48f62377ad1a972581c35bcc8373.zip
Rename to `quote_default_expression` from `quote_value`
-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.rb2
2 files changed, 3 insertions, 3 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..6a684a33f8 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
@@ -83,7 +83,7 @@ module ActiveRecord
end
def add_column_options!(sql, options)
- sql << " DEFAULT #{quote_value(options[:default], options[:column])}" if options_include_default?(options)
+ sql << " DEFAULT #{quote_default_expression(options[:default], options[:column])}" if options_include_default?(options)
# must explicitly check for :null to allow change_column to work on migrations
if options[:null] == false
sql << " NOT NULL"
@@ -94,7 +94,7 @@ module ActiveRecord
sql
end
- def quote_value(value, column)
+ def quote_default_expression(value, column)
column.sql_type ||= type_to_sql(column.type, column.limit, column.precision, column.scale)
column.cast_type ||= type_for_column(column)
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 89b7f0a6b7..009b7cd682 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -32,7 +32,7 @@ module ActiveRecord
super
end
- def quote_value(value, column)
+ def quote_default_expression(value, column)
if column.type == :uuid && value =~ /\(\)/
value
else