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/sqlite3_adapter.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/sqlite3_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 16ef195bfc..f55efe7d07 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -420,11 +420,10 @@ module ActiveRecord def change_column(table_name, column_name, type, options = {}) #:nodoc: alter_table(table_name) do |definition| - include_default = options_include_default?(options) definition[column_name].instance_eval do self.type = type self.limit = options[:limit] if options.include?(:limit) - self.default = options[:default] if include_default + self.default = options[:default] if options.include?(:default) self.null = options[:null] if options.include?(:null) self.precision = options[:precision] if options.include?(:precision) self.scale = options[:scale] if options.include?(:scale) |