aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/migration
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-12-17 11:49:43 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-02-04 21:05:23 +0900
commit4db72741e9906ef3bb23c932122b8ab154a3fe2f (patch)
tree2dc70d9cd523d58d10f509c74b54485593dbaef4 /activerecord/lib/active_record/migration
parent605837a61933fc1e94097eea30e659bb9ef516eb (diff)
downloadrails-4db72741e9906ef3bb23c932122b8ab154a3fe2f.tar.gz
rails-4db72741e9906ef3bb23c932122b8ab154a3fe2f.tar.bz2
rails-4db72741e9906ef3bb23c932122b8ab154a3fe2f.zip
Restore the behaviour of the compatibility layer for integer-like PKs
The PR #27384 changed migration compatibility behaviour. ```ruby class CreateMasterData < ActiveRecord::Migration[5.0] def change create_table :master_data, id: :integer do |t| t.string :name end end end ``` Previously this migration created non-autoincremental primary key expected. But after the PR, the primary key changed to autoincremental, it is unexpected. This change restores the behaviour of the compatibility layer.
Diffstat (limited to 'activerecord/lib/active_record/migration')
-rw-r--r--activerecord/lib/active_record/migration/compatibility.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/migration/compatibility.rb b/activerecord/lib/active_record/migration/compatibility.rb
index ffeca2c91e..f6c9127d34 100644
--- a/activerecord/lib/active_record/migration/compatibility.rb
+++ b/activerecord/lib/active_record/migration/compatibility.rb
@@ -21,6 +21,12 @@ module ActiveRecord
end
end
+ unless adapter_name == "Mysql2" && options[:id] == :bigint
+ if [:integer, :bigint].include?(options[:id]) && !options.key?(:default)
+ options[:default] = nil
+ end
+ end
+
# Since 5.1 Postgres adapter uses bigserial type for primary
# keys by default and MySQL uses bigint. This compat layer makes old migrations utilize
# serial/int type instead -- the way it used to work before 5.1.