From b9791d18da30dff98250f6753ea99cf93baad147 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sun, 13 Sep 2015 17:56:00 +0900 Subject: Eliminate the duplicated `options_include_default?` method Follow up 7ba2cd06. --- .../connection_adapters/abstract/schema_creation.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb') 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 18d943f452..97ed0922f2 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb @@ -14,8 +14,10 @@ module ActiveRecord send m, o end - delegate :quote_column_name, :quote_table_name, :quote_default_expression, :type_to_sql, to: :@conn - private :quote_column_name, :quote_table_name, :quote_default_expression, :type_to_sql + delegate :quote_column_name, :quote_table_name, :quote_default_expression, :type_to_sql, + :options_include_default?, to: :@conn + private :quote_column_name, :quote_table_name, :quote_default_expression, :type_to_sql, + :options_include_default? private @@ -89,10 +91,6 @@ module ActiveRecord sql end - def options_include_default?(options) - options.include?(:default) && !(options[:null] == false && options[:default].nil?) - end - def action_sql(action, dependency) case dependency when :nullify then "ON #{action} SET NULL" -- cgit v1.2.3