diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-23 13:51:55 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-23 13:51:55 -0300 |
| commit | 6f37d7e117d8a27d622002b1921218cdc60611fa (patch) | |
| tree | d65d51896749d2219a8704a72806392e2a553407 /activerecord/lib/active_record | |
| parent | 0df2f7faef2933cf1d3d6e797a1f2e808ef92f7b (diff) | |
| parent | c0abeadc0e62fc6f7a066f4d8db9895525ad8258 (diff) | |
| download | rails-6f37d7e117d8a27d622002b1921218cdc60611fa.tar.gz rails-6f37d7e117d8a27d622002b1921218cdc60611fa.tar.bz2 rails-6f37d7e117d8a27d622002b1921218cdc60611fa.zip | |
Merge pull request #18880 from mudge/timestamp-index-bug
Fix missing index when using timestamps with index
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index cb83d0022c..4761024ad0 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -359,6 +359,7 @@ module ActiveRecord def column(name, type, options = {}) name = name.to_s type = type.to_sym + options = options.dup if @columns_hash[name] && @columns_hash[name].primary_key? raise ArgumentError, "you can't redefine the primary key column '#{name}'. To define a custom primary key, pass { id: false } to create_table." |