diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2015-09-13 17:56:00 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2015-09-13 17:56:00 +0900 |
commit | b9791d18da30dff98250f6753ea99cf93baad147 (patch) | |
tree | 854a2686b179c0e676a432d809a98ad6ca099b80 /activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb | |
parent | 602ec7a4a21846db74f0371eb27784f19f80e28c (diff) | |
download | rails-b9791d18da30dff98250f6753ea99cf93baad147.tar.gz rails-b9791d18da30dff98250f6753ea99cf93baad147.tar.bz2 rails-b9791d18da30dff98250f6753ea99cf93baad147.zip |
Eliminate the duplicated `options_include_default?` method
Follow up 7ba2cd06.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb | 10 |
1 files changed, 4 insertions, 6 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 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" |