aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2015-02-10 22:31:35 +0900
committerRyuta Kamizono <kamipo@gmail.com>2015-02-11 10:26:23 +0900
commitbb2a7c38d8db5be7ac361ef208afba889370a5a9 (patch)
treeb09c9c40859aa9cefe440cfbbfb69feb4b2cbf5d /activerecord/lib/active_record/connection_adapters/abstract
parent17d9996c91918df4c32b8ed7c67c2bbe715cfc9d (diff)
downloadrails-bb2a7c38d8db5be7ac361ef208afba889370a5a9.tar.gz
rails-bb2a7c38d8db5be7ac361ef208afba889370a5a9.tar.bz2
rails-bb2a7c38d8db5be7ac361ef208afba889370a5a9.zip
Refactor `quote_default_expression`
`quote_default_expression` and `quote_default_value` are almost the same handling for do not quote default function of `:uuid` columns. Rename `quote_default_value` to `quote_default_expression`, and remove duplicate code.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/quoting.rb5
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb7
2 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index 29d85d82cb..947e11c7bf 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -102,6 +102,11 @@ module ActiveRecord
quote_table_name("#{table}.#{attr}")
end
+ def quote_default_expression(value, column) #:nodoc:
+ value = lookup_cast_type(column.sql_type).type_cast_for_database(value)
+ quote(value)
+ end
+
def quoted_true
"'t'"
end
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 81f8615976..bc8fa9b6cf 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb
@@ -98,8 +98,7 @@ module ActiveRecord
end
def quote_default_expression(value, column)
- value = type_for_column(column).type_cast_for_database(value)
- @conn.quote(value)
+ @conn.quote_default_expression(value, column)
end
def options_include_default?(options)
@@ -118,10 +117,6 @@ module ActiveRecord
MSG
end
end
-
- def type_for_column(column)
- @conn.lookup_cast_type(column.sql_type)
- end
end
end
end