diff options
| author | Dongqing Hu <sorra@outlook.com> | 2017-02-26 03:20:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-26 03:20:12 -0600 |
| commit | 9ce2405b3c7f4f555becef162ea2e8af341d47c9 (patch) | |
| tree | 79741c67a8c7e31bb7e30d9bd1d771e3ff419228 /activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | |
| parent | 143a6cfcf65082343fa2c5c0af4a62fa732c8ad9 (diff) | |
| parent | 2d84a6bc74fbe9d9b97bf7d63ec6f27418d9c3a6 (diff) | |
| download | rails-9ce2405b3c7f4f555becef162ea2e8af341d47c9.tar.gz rails-9ce2405b3c7f4f555becef162ea2e8af341d47c9.tar.bz2 rails-9ce2405b3c7f4f555becef162ea2e8af341d47c9.zip | |
Merge branch 'master' into fresh-thread-tagged-logging
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 a61d920a73..f91547d148 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -489,7 +489,7 @@ module ActiveRecord end execute sql - change_column_default(table_name, column_name, options[:default]) if options_include_default?(options) + change_column_default(table_name, column_name, options[:default]) if options.key?(:default) change_column_null(table_name, column_name, options[:null], options[:default]) if options.key?(:null) change_column_comment(table_name, column_name, options[:comment]) if options.key?(:comment) end |