declare_schema 0.10.0.pre.dc.1 → 0.12.0.pre.1

data/lib/generators/declare_schema/migration/templates/migration.rb.erb

@@ -1,9 +1,9 @@
-class <%= @migration_class_name %> < (Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
+class <%= @migration_class_name %> < (ActiveSupport::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def self.up
-    <%= @up %>
+    <%= @up.presence or raise "no @up given!" %>
   end
 
   def self.down
-    <%= @down %>
+    <%= @down.presence or raise "no @down given!" %>
   end
 end

data/spec/lib/declare_schema/api_spec.rb

@@ -39,12 +39,14 @@ RSpec.describe 'DeclareSchema API' do
 
       load_models
 
-      if Rails::VERSION::MAJOR == 5
+      if ActiveSupport::VERSION::MAJOR == 5
         # TODO: get this to work on Travis for Rails 6
+        # TODO: uncomment since we're not on Travis any more? -Colin
         generate_migrations '-n', '-m'
       end
 
       require 'advert'
+      Advert.reset_primary_key
 
       ## The Basics
 

data/spec/lib/declare_schema/field_spec_spec.rb

@@ -6,13 +6,13 @@ rescue LoadError
 end
 
 RSpec.describe DeclareSchema::Model::FieldSpec do
-  let(:model) { double('model', table_options: {}, _defined_primary_key: 'id') }
+  let(:model) { double('model', _table_options: {}, _declared_primary_key: 'id') }
   let(:col_spec) { double('col_spec', type: :string) }
 
   before do
     load File.expand_path('prepare_testapp.rb', __dir__)
 
-    if Rails::VERSION::MAJOR < 5
+    if ActiveSupport::VERSION::MAJOR < 5
       allow(col_spec).to receive(:type_cast_from_database, &:itself)
     end
   end
@@ -184,7 +184,7 @@ RSpec.describe DeclareSchema::Model::FieldSpec do
 
   describe '#schema_attributes' do
     let(:col_spec) do
-      case Rails::VERSION::MAJOR
+      case ActiveSupport::VERSION::MAJOR
       when 4
         cast_type = ActiveRecord::Type::Integer.new(limit: 8)
         ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "integer(8)", false)

data/spec/lib/declare_schema/generator_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
     EOS
 
-    case Rails::VERSION::MAJOR
+    case ActiveSupport::VERSION::MAJOR
     when 4, 5
       expect_test_definition_to_eq('alpha/beta', <<~EOS)
         require "test_helper"
@@ -50,7 +50,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       EOS
     end
 
-    case Rails::VERSION::MAJOR
+    case ActiveSupport::VERSION::MAJOR
     when 4
       expect_test_fixture_to_eq('alpha/beta', <<~EOS)
         # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html

data/spec/lib/declare_schema/interactive_primary_key_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'rails'
 begin
   require 'mysql2'
 rescue LoadError
@@ -20,7 +19,7 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
       end
 
       generate_migrations '-n', '-m'
-      expect(Foo._defined_primary_key).to eq('foo_id')
+      expect(Foo._declared_primary_key).to eq('foo_id')
 
       ### migrate from
       # rename from custom primary_key
@@ -32,13 +31,38 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
 
       allow_any_instance_of(DeclareSchema::Support::ThorShell).to receive(:ask).with(/one of the rename choices or press enter to keep/) { 'id' }
       generate_migrations '-n', '-m'
-      expect(Foo._defined_primary_key).to eq('id')
+      expect(Foo._declared_primary_key).to eq('id')
 
       nuke_model_class(Foo)
 
-      ### migrate to
+      # The ActiveRecord sqlite3 driver has a bug where rename_column recreates the entire table, but forgets to set the primary key:
+      #
+      # [7] pry(#<RSpec::ExampleGroups::DeclareSchemaMigrationGeneratorInteractivePrimaryKey>)> u = 'rename_column :foos, :foo_id, :id'
+      # => "rename_column :foos, :foo_id, :id"
+      # [8] pry(#<RSpec::ExampleGroups::DeclareSchemaMigrationGeneratorInteractivePrimaryKey>)> ActiveRecord::Migration.class_eval(u)
+      # (0.0ms)  begin transaction
+      #  (pry):17
+      # (0.2ms)  CREATE TEMPORARY TABLE "afoos" ("id" integer NOT NULL)
+      #  (pry):17
+      # (0.1ms)  INSERT INTO "afoos" ("id")
+      #
+      #  (pry):17
+      # (0.4ms)  DROP TABLE "foos"
+      #  (pry):17
+      # (0.1ms)  CREATE TABLE "foos" ("id" integer NOT NULL)
+      #  (pry):17
+      # (0.1ms)  INSERT INTO "foos" ("id")
+      #
+      #  (pry):17
+      # (0.1ms)  DROP TABLE "afoos"
+      #  (pry):17
+      # (0.9ms)  commit transaction
+      if defined?(SQLite3)
+        ActiveRecord::Base.connection.execute("drop table foos")
+        ActiveRecord::Base.connection.execute("CREATE TABLE foos (id integer PRIMARY KEY AUTOINCREMENT NOT NULL)")
+      end
 
-      if Rails::VERSION::MAJOR >= 5 && !defined?(Mysql2) # TODO TECH-4814 Put this test back for Mysql2
+      if ActiveSupport::VERSION::MAJOR >= 5 && !defined?(Mysql2) # TODO TECH-4814 Put this test back for Mysql2
         # replace custom primary_key
         class Foo < ActiveRecord::Base
           fields do
@@ -48,13 +72,7 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
 
         allow_any_instance_of(DeclareSchema::Support::ThorShell).to receive(:ask).with(/one of the rename choices or press enter to keep/) { 'drop id' }
         generate_migrations '-n', '-m'
-        expect(Foo._defined_primary_key).to eq('foo_id')
-
-        ### ensure it doesn't cause further migrations
-
-        # check no further migrations
-        up = Generators::DeclareSchema::Migration::Migrator.run.first
-        expect(up).to eq("")
+        expect(Foo._declared_primary_key).to eq('foo_id')
       end
     end
   end
@@ -62,8 +80,7 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
   context 'Using declare_schema' do
     it "allows alternate primary keys" do
       class Foo < ActiveRecord::Base
-        declare_schema do
-        end
+        declare_schema { }
         self.primary_key = "foo_id"
       end
 
@@ -73,21 +90,45 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
       ### migrate from
       # rename from custom primary_key
       class Foo < ActiveRecord::Base
-        declare_schema do
-        end
+        declare_schema { }
         self.primary_key = "id"
       end
 
       puts "\n\e[45m Please enter 'id' (no quotes) at the next prompt \e[0m"
       allow_any_instance_of(DeclareSchema::Support::ThorShell).to receive(:ask).with(/one of the rename choices or press enter to keep/) { 'id' }
       generate_migrations '-n', '-m'
-      expect(Foo.primary_key).to eq('id')
+      expect(Foo._declared_primary_key).to eq('id')
 
       nuke_model_class(Foo)
 
-      ### migrate to
+      # The ActiveRecord sqlite3 driver has a bug where rename_column recreates the entire table, but forgets to set the primary key:
+      #
+      # [7] pry(#<RSpec::ExampleGroups::DeclareSchemaMigrationGeneratorInteractivePrimaryKey>)> u = 'rename_column :foos, :foo_id, :id'
+      # => "rename_column :foos, :foo_id, :id"
+      # [8] pry(#<RSpec::ExampleGroups::DeclareSchemaMigrationGeneratorInteractivePrimaryKey>)> ActiveRecord::Migration.class_eval(u)
+      # (0.0ms)  begin transaction
+      #  (pry):17
+      # (0.2ms)  CREATE TEMPORARY TABLE "afoos" ("id" integer NOT NULL)
+      #  (pry):17
+      # (0.1ms)  INSERT INTO "afoos" ("id")
+      #
+      #  (pry):17
+      # (0.4ms)  DROP TABLE "foos"
+      #  (pry):17
+      # (0.1ms)  CREATE TABLE "foos" ("id" integer NOT NULL)
+      #  (pry):17
+      # (0.1ms)  INSERT INTO "foos" ("id")
+      #
+      #  (pry):17
+      # (0.1ms)  DROP TABLE "afoos"
+      #  (pry):17
+      # (0.9ms)  commit transaction
+      if defined?(SQLite3)
+        ActiveRecord::Base.connection.execute("drop table foos")
+        ActiveRecord::Base.connection.execute("CREATE TABLE foos (id integer PRIMARY KEY AUTOINCREMENT NOT NULL)")
+      end
 
-      if Rails::VERSION::MAJOR >= 5 && !defined?(Mysql2) # TODO TECH-4814 Put this test back for Mysql2
+      if ActiveSupport::VERSION::MAJOR >= 5 && !defined?(Mysql2) # TODO TECH-4814 Put this test back for Mysql2
         # replace custom primary_key
         class Foo < ActiveRecord::Base
           declare_schema do
@@ -99,12 +140,6 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
         allow_any_instance_of(DeclareSchema::Support::ThorShell).to receive(:ask).with(/one of the rename choices or press enter to keep/) { 'drop id' }
         generate_migrations '-n', '-m'
         expect(Foo.primary_key).to eq('foo_id')
-
-        ### ensure it doesn't cause further migrations
-
-        # check no further migrations
-        up = Generators::DeclareSchema::Migration::Migrator.run.first
-        expect(up).to eq("")
       end
     end
   end

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -1,25 +1,19 @@
 # frozen_string_literal: true
 
-require 'rails'
 begin
   require 'mysql2'
 rescue LoadError
 end
 
+begin
+  require 'sqlite3'
+rescue LoadError
+end
+
 RSpec.describe 'DeclareSchema Migration Generator' do
   before do
     load File.expand_path('prepare_testapp.rb', __dir__)
   end
-
-  let(:charset_alter_table) do
-    if defined?(Mysql2)
-      <<~EOS
-
-
-        execute "ALTER TABLE `adverts` CHARACTER SET utf8mb4 COLLATE utf8mb4_bin"
-      EOS
-    end
-  end
   let(:text_limit) do
     if defined?(Mysql2)
       ", limit: 4294967295"
@@ -30,21 +24,26 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       ', charset: "utf8mb4", collation: "utf8mb4_bin"'
     end
   end
+  let(:create_table_charset_and_collation) do
+    if defined?(Mysql2)
+      ", options: \"CHARACTER SET utf8mb4 COLLATE utf8mb4_bin\""
+    end
+  end
   let(:datetime_precision) do
-    if defined?(Mysql2) && Rails::VERSION::MAJOR >= 5
+    if defined?(Mysql2) && ActiveSupport::VERSION::MAJOR >= 5
       ', precision: 0'
     end
   end
   let(:table_options) do
     if defined?(Mysql2)
-      ", options: \"#{'ENGINE=InnoDB ' if Rails::VERSION::MAJOR == 5}DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin\"" +
-        if Rails::VERSION::MAJOR >= 6
+      ", options: \"#{'ENGINE=InnoDB ' if ActiveSupport::VERSION::MAJOR == 5}DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin\"" +
+        if ActiveSupport::VERSION::MAJOR >= 6
           ', charset: "utf8mb4", collation: "utf8mb4_bin"'
         else
           ''
         end
     else
-      ", id: :integer" unless Rails::VERSION::MAJOR < 5
+      ", id: :integer" unless ActiveSupport::VERSION::MAJOR < 5
     end
   end
   let(:lock_version_limit) do
@@ -81,9 +80,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       up, _ = Generators::DeclareSchema::Migration::Migrator.run.tap do |migrations|
         expect(migrations).to(
           migrate_up(<<~EOS.strip)
-            create_table :adverts, id: :bigint do |t|
+            create_table :adverts, id: :bigint#{create_table_charset_and_collation} do |t|
               t.string :name, limit: 250, null: true#{charset_and_collation}
-            end#{charset_alter_table}
+            end
           EOS
           .and migrate_down("drop_table :adverts")
         )
@@ -92,7 +91,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       ActiveRecord::Migration.class_eval(up)
       expect(Advert.columns.map(&:name)).to eq(["id", "name"])
 
-      if Rails::VERSION::MAJOR < 5
+      if ActiveSupport::VERSION::MAJOR < 5
         # Rails 4 drivers don't always create PK properly. Fix that by dropping and recreating.
         ActiveRecord::Base.connection.execute("drop table adverts")
         if defined?(Mysql2)
@@ -119,8 +118,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           add_column :adverts, :published_at, :datetime, null: true
         EOS
         .and migrate_down(<<~EOS.strip)
-          remove_column :adverts, :body
           remove_column :adverts, :published_at
+          remove_column :adverts, :body
         EOS
       )
 
@@ -152,8 +151,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           remove_column :adverts, :name
         EOS
         .and migrate_down(<<~EOS.strip)
-          remove_column :adverts, :title
           add_column :adverts, :name, :string, limit: 250, null: true#{charset_and_collation}
+          remove_column :adverts, :title
         EOS
       )
 
@@ -370,17 +369,13 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :category_id, :integer, limit: 8, null: false
-
-          add_index :adverts, [:category_id], name: 'on_category_id'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" if defined?(Mysql2)}
+          add_index :adverts, [:category_id], name: :on_category_id
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id" if defined?(Mysql2)}
         EOS
         .and migrate_down(<<~EOS.strip)
+          #{"remove_foreign_key :adverts, name: :index_adverts_on_category_id" if defined?(Mysql2)}
+          remove_index :adverts, name: :on_category_id
           remove_column :adverts, :category_id
-
-          remove_index :adverts, name: :on_category_id rescue ActiveRecord::StatementInvalid
-
-          #{"remove_foreign_key(\"adverts\", name: \"on_category_id\")\n" if defined?(Mysql2)}
         EOS
       )
 
@@ -398,11 +393,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :c_id, :integer, limit: 8, null: false
-
-          add_index :adverts, [:c_id], name: 'on_c_id'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-            "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
+          add_index :adverts, [:c_id], name: :on_c_id
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -420,9 +413,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :category_id, :integer, limit: 8, null: false
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-            "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -440,21 +432,19 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :category_id, :integer, limit: 8, null: false
-
-          add_index :adverts, [:category_id], name: 'my_index'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-            "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
+          add_index :adverts, [:category_id], name: :my_index
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
       )
 
       Advert.field_specs.delete(:category_id)
       Advert.index_definitions.delete_if { |spec| spec.fields == ["category_id"] }
 
-      ### Timestamps and Optimimistic Locking
+      ### Timestamps and Optimistic Locking
 
       # `updated_at` and `created_at` can be declared with the shorthand `timestamps`.
-      # Similarly, `lock_version` can be declared with the "shorthand" `optimimistic_lock`.
+      # Similarly, `lock_version` can be declared with the "shorthand" `optimistic_lock`.
 
       class Advert < ActiveRecord::Base
         fields do
@@ -468,17 +458,15 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           add_column :adverts, :created_at, :datetime, null: true
           add_column :adverts, :updated_at, :datetime, null: true
           add_column :adverts, :lock_version, :integer#{lock_version_limit}, null: false, default: 1
-  
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-            "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
         .and migrate_down(<<~EOS.strip)
-          remove_column :adverts, :created_at
-          remove_column :adverts, :updated_at
+          #{"remove_foreign_key :adverts, name: :index_adverts_on_c_id\n" +
+            "remove_foreign_key :adverts, name: :index_adverts_on_category_id" if defined?(Mysql2)}
           remove_column :adverts, :lock_version
-
-          #{"remove_foreign_key(\"adverts\", name: \"on_category_id\")\n" +
-            "remove_foreign_key(\"adverts\", name: \"on_c_id\")" if defined?(Mysql2)}
+          remove_column :adverts, :updated_at
+          remove_column :adverts, :created_at
         EOS
       )
 
@@ -499,11 +487,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title], name: 'on_title'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-            "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
+          add_index :adverts, [:title], name: :on_title
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -520,11 +506,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title], unique: true, name: 'on_title'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-            "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
+          add_index :adverts, [:title], name: :on_title, unique: true
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -541,11 +525,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title], name: 'my_index'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-            "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
+          add_index :adverts, [:title], name: :my_index
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -560,11 +542,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title], name: 'on_title'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-            "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
+          add_index :adverts, [:title], name: :on_title
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -579,11 +559,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title], unique: true, name: 'my_index'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-            "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
+          add_index :adverts, [:title], name: :my_index, unique: true
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -598,11 +576,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title, :category_id], name: 'on_title_and_category_id'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-            "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
+          add_index :adverts, [:title, :category_id], name: :on_title_and_category_id
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -614,7 +590,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
       ### Rename a table
 
-      # The migration generator respects the `set_table_name` declaration, although as before, we need to explicitly tell the generator that we want a rename rather than a create and a drop.
+      # The migration generator respects the `set_table_name` declaration, although as before,
+      # we need to explicitly tell the generator that we want a rename rather than a create and a drop.
 
       class Advert < ActiveRecord::Base
         self.table_name = "ads"
@@ -630,31 +607,21 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run("adverts" => "ads")).to(
         migrate_up(<<~EOS.strip)
           rename_table :adverts, :ads
-
           add_column :ads, :title, :string, limit: 250, null: true#{charset_and_collation}
           add_column :ads, :body, :text#{', limit: 4294967295' if defined?(Mysql2)}, null: true#{charset_and_collation}
-
-          #{if defined?(SQLite3)
-              "add_index :ads, [:id], unique: true, name: 'PRIMARY'\n"
-            elsif defined?(Mysql2)
-              "execute \"ALTER TABLE ads DROP PRIMARY KEY, ADD PRIMARY KEY (id)\"\n\n" +
-              "add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-              "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")"
+          #{if defined?(Mysql2)
+              "add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+              "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id"
             end}
         EOS
         .and migrate_down(<<~EOS.strip)
-          remove_column :ads, :title
+          #{if defined?(Mysql2)
+              "remove_foreign_key :adverts, name: :index_adverts_on_c_id\n" +
+              "remove_foreign_key :adverts, name: :index_adverts_on_category_id"
+            end}
           remove_column :ads, :body
-
+          remove_column :ads, :title
           rename_table :ads, :adverts
-
-          #{if defined?(SQLite3)
-              "add_index :adverts, [:id], unique: true, name: 'PRIMARY'\n"
-            elsif defined?(Mysql2)
-              "execute \"ALTER TABLE adverts DROP PRIMARY KEY, ADD PRIMARY KEY (id)\"\n\n" +
-              "remove_foreign_key(\"adverts\", name: \"on_category_id\")\n" +
-              "remove_foreign_key(\"adverts\", name: \"on_c_id\")"
-            end}
         EOS
       )
 
@@ -684,29 +651,15 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run("adverts" => "advertisements")).to(
         migrate_up(<<~EOS.strip)
           rename_table :adverts, :advertisements
-
           add_column :advertisements, :title, :string, limit: 250, null: true#{charset_and_collation}
           add_column :advertisements, :body, :text#{', limit: 4294967295' if defined?(Mysql2)}, null: true#{charset_and_collation}
           remove_column :advertisements, :name
-
-          #{if defined?(SQLite3)
-              "add_index :advertisements, [:id], unique: true, name: 'PRIMARY'"
-            elsif defined?(Mysql2)
-              "execute \"ALTER TABLE advertisements DROP PRIMARY KEY, ADD PRIMARY KEY (id)\""
-            end}
         EOS
         .and migrate_down(<<~EOS.strip)
-          remove_column :advertisements, :title
+          add_column :advertisements, :name, :string, limit: 250, null: true#{charset_and_collation}
           remove_column :advertisements, :body
-          add_column :adverts, :name, :string, limit: 250, null: true#{charset_and_collation}
-
+          remove_column :advertisements, :title
           rename_table :advertisements, :adverts
-
-          #{if defined?(SQLite3)
-              "add_index :adverts, [:id], unique: true, name: 'PRIMARY'"
-            elsif defined?(Mysql2)
-              "execute \"ALTER TABLE adverts DROP PRIMARY KEY, ADD PRIMARY KEY (id)\""
-            end}
         EOS
       )
 
@@ -753,13 +706,11 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         expect(migrations).to(
           migrate_up(<<~EOS.strip)
             add_column :adverts, :type, :string, limit: 250, null: true#{charset_and_collation}
-
-            add_index :adverts, [:type], name: 'on_type'
+            add_index :adverts, [:type], name: :on_type
           EOS
           .and migrate_down(<<~EOS.strip)
             remove_column :adverts, :type
-
-            remove_index :adverts, name: :on_type rescue ActiveRecord::StatementInvalid
+            remove_index :adverts, name: :on_type
           EOS
         )
       end
@@ -802,8 +753,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           change_column :adverts, :name, :string, limit: 250, null: true, default: "No Name"#{charset_and_collation}
         EOS
         .and migrate_down(<<~EOS.strip)
+          change_column :adverts, :name, :string, limit: 250, null: true, default: "Untitled"#{charset_and_collation}
           rename_column :adverts, :name, :title
-          change_column :adverts, :title, :string, limit: 250, null: true, default: "Untitled"#{charset_and_collation}
         EOS
       )
 
@@ -821,15 +772,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run(adverts: :ads)).to(
         migrate_up(<<~EOS.strip)
           rename_table :adverts, :ads
-
           add_column :ads, :created_at, :datetime, null: false
           change_column :ads, :title, :string, limit: 250, null: false, default: \"Untitled\"#{charset_and_collation}
-
-          #{if defined?(SQLite3)
-              "add_index :ads, [:id], unique: true, name: 'PRIMARY'"
-            elsif defined?(Mysql2)
-              'execute "ALTER TABLE ads DROP PRIMARY KEY, ADD PRIMARY KEY (id)"'
-            end}
         EOS
       )
 
@@ -856,12 +800,6 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Generators::DeclareSchema::Migration::Migrator.run(adverts: { id: :advert_id })).to(
         migrate_up(<<~EOS.strip)
           rename_column :adverts, :id, :advert_id
-
-          #{if defined?(SQLite3)
-              "add_index :adverts, [:advert_id], unique: true, name: 'PRIMARY'"
-            elsif defined?(Mysql2)
-            'execute "ALTER TABLE adverts DROP PRIMARY KEY, ADD PRIMARY KEY (advert_id)"'
-            end}
         EOS
       )
 
@@ -902,6 +840,54 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{:presence=>true, :uniqueness=>{:case_sensitive=>false}}")
     end
 
+    context 'models with the same parent foreign key relation' do
+      before do
+        class Category < ActiveRecord::Base
+          fields do
+            name :string, limit: 250, null: true
+          end
+        end
+        class Advertiser < ActiveRecord::Base
+          fields do
+            name :string, limit: 250, null: true
+          end
+          belongs_to :category, limit: 8
+        end
+        class Affiliate < ActiveRecord::Base
+          fields do
+            name :string, limit: 250, null: true
+          end
+          belongs_to :category, limit: 8
+        end
+      end
+
+      it 'will genereate unique constraint names' do
+        expect(Generators::DeclareSchema::Migration::Migrator.run).to(
+          migrate_up(<<~EOS.strip)
+            create_table :categories, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+              t.string :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+            end
+            create_table :advertisers, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+              t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+              t.integer :category_id, limit: 8, null: false
+            end
+            create_table :affiliates, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+              t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+              t.integer :category_id, limit: 8, null: false
+            end
+            add_index :advertisers, [:category_id], name: :on_category_id
+            add_index :affiliates, [:category_id], name: :on_category_id
+            add_foreign_key :advertisers, :categories, column: :category_id, name: :index_advertisers_on_category_id
+            add_foreign_key :affiliates, :categories, column: :category_id, name: :index_affiliates_on_category_id
+          EOS
+        )
+        migrate
+
+        nuke_model_class(Advertiser)
+        nuke_model_class(Affiliate)
+      end
+    end if !defined?(SQLite3) && ActiveRecord::VERSION::MAJOR >= 5
+
     describe 'serialize' do
       before do
         class Ad < ActiveRecord::Base
@@ -1086,8 +1072,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
     end
 
-    context "for Rails #{Rails::VERSION::MAJOR}" do
-      if Rails::VERSION::MAJOR >= 5
+    context "for Rails #{ActiveSupport::VERSION::MAJOR}" do
+      if ActiveSupport::VERSION::MAJOR >= 5
         let(:optional_true) { { optional: true } }
         let(:optional_false) { { optional: false } }
       else
@@ -1193,13 +1179,13 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         migration_content = File.read(migrations.first)
         first_line = migration_content.split("\n").first
         base_class = first_line.split(' < ').last
-        expect(base_class).to eq("(Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)")
+        expect(base_class).to eq("(ActiveSupport::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)")
       end
     end
 
     context 'Does not generate migrations' do
       it 'for aliased fields bigint -> integer limit 8' do
-        if Rails::VERSION::MAJOR >= 5 || !ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
+        if ActiveSupport::VERSION::MAJOR >= 5 || !ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
           class Advert < active_record_base_class.constantize
             fields do
               price :bigint
@@ -1211,7 +1197,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           migrations = Dir.glob('db/migrate/*declare_schema_migration*.rb')
           expect(migrations.size).to eq(1), migrations.inspect
 
-          if defined?(Mysql2) && Rails::VERSION::MAJOR < 5
+          if defined?(Mysql2) && ActiveSupport::VERSION::MAJOR < 5
             ActiveRecord::Base.connection.execute("ALTER TABLE adverts ADD PRIMARY KEY (id)")
           end
 
@@ -1252,19 +1238,19 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
       up, _ = Generators::DeclareSchema::Migration::Migrator.run.tap do |migrations|
         expect(migrations).to(
-            migrate_up(<<~EOS.strip)
-            create_table :adverts, id: :bigint do |t|
+          migrate_up(<<~EOS.strip)
+            create_table :adverts, id: :bigint#{create_table_charset_and_collation} do |t|
               t.string :name, limit: 250, null: true#{charset_and_collation}
-            end#{charset_alter_table}
-            EOS
-                .and migrate_down("drop_table :adverts")
+            end
+          EOS
+          .and migrate_down("drop_table :adverts")
         )
       end
 
       ActiveRecord::Migration.class_eval(up)
       expect(Advert.columns.map(&:name)).to eq(["id", "name"])
 
-      if Rails::VERSION::MAJOR < 5
+      if ActiveSupport::VERSION::MAJOR < 5
         # Rails 4 drivers don't always create PK properly. Fix that by dropping and recreating.
         ActiveRecord::Base.connection.execute("drop table adverts")
         if defined?(Mysql2)
@@ -1286,14 +1272,14 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       Advert.reset_column_information
 
       expect(migrate).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :body, :text#{text_limit}, null: true#{charset_and_collation}
           add_column :adverts, :published_at, :datetime, null: true
-          EOS
-              .and migrate_down(<<~EOS.strip)
-          remove_column :adverts, :body
+        EOS
+        .and migrate_down(<<~EOS.strip)
           remove_column :adverts, :published_at
-      EOS
+          remove_column :adverts, :body
+        EOS
       )
 
       Advert.field_specs.clear # not normally needed
@@ -1319,14 +1305,14 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
           remove_column :adverts, :name
-          EOS
-              .and migrate_down(<<~EOS.strip)
-          remove_column :adverts, :title
+        EOS
+        .and migrate_down(<<~EOS.strip)
           add_column :adverts, :name, :string, limit: 250, null: true#{charset_and_collation}
-      EOS
+          remove_column :adverts, :title
+        EOS
       )
 
       expect(Generators::DeclareSchema::Migration::Migrator.run(adverts: { name: :title })).to(
@@ -1540,20 +1526,16 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :category_id, :integer, limit: 8, null: false
-
-          add_index :adverts, [:category_id], name: 'on_category_id'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" if defined?(Mysql2)}
-          EOS
-              .and migrate_down(<<~EOS.strip)
+          add_index :adverts, [:category_id], name: :on_category_id
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" if defined?(Mysql2)}
+        EOS
+        .and migrate_down(<<~EOS.strip)
+          #{"remove_foreign_key :adverts, name: :index_adverts_on_category_id" if defined?(Mysql2)}
+          remove_index :adverts, name: :on_category_id
           remove_column :adverts, :category_id
-
-          remove_index :adverts, name: :on_category_id rescue ActiveRecord::StatementInvalid
-
-          #{"remove_foreign_key(\"adverts\", name: \"on_category_id\")\n" if defined?(Mysql2)}
-      EOS
+        EOS
       )
 
       Advert.field_specs.delete(:category_id)
@@ -1568,14 +1550,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :c_id, :integer, limit: 8, null: false
-
-          add_index :adverts, [:c_id], name: 'on_c_id'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-          "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
-      EOS
+          add_index :adverts, [:c_id], name: :on_c_id
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.field_specs.delete(:c_id)
@@ -1590,12 +1570,11 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :category_id, :integer, limit: 8, null: false
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-          "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
-      EOS
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+       EOS
       )
 
       Advert.field_specs.delete(:category_id)
@@ -1610,14 +1589,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :category_id, :integer, limit: 8, null: false
-
-          add_index :adverts, [:category_id], name: 'my_index'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-          "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
-      EOS
+          add_index :adverts, [:category_id], name: :my_index
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.field_specs.delete(:category_id)
@@ -1636,22 +1613,20 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :created_at, :datetime, null: true
           add_column :adverts, :updated_at, :datetime, null: true
           add_column :adverts, :lock_version, :integer#{lock_version_limit}, null: false, default: 1
-  
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-              "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
-          EOS
-              .and migrate_down(<<~EOS.strip)
-          remove_column :adverts, :created_at
-          remove_column :adverts, :updated_at
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+        EOS
+        .and migrate_down(<<~EOS.strip)
+          #{"remove_foreign_key :adverts, name: :index_adverts_on_c_id\n" +
+            "remove_foreign_key :adverts, name: :index_adverts_on_category_id" if defined?(Mysql2)}
           remove_column :adverts, :lock_version
-
-          #{"remove_foreign_key(\"adverts\", name: \"on_category_id\")\n" +
-          "remove_foreign_key(\"adverts\", name: \"on_c_id\")" if defined?(Mysql2)}
-      EOS
+          remove_column :adverts, :updated_at
+          remove_column :adverts, :created_at
+        EOS
       )
 
       Advert.field_specs.delete(:updated_at)
@@ -1669,14 +1644,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title], name: 'on_title'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-          "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
-      EOS
+          add_index :adverts, [:title], name: :on_title
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields==["title"] }
@@ -1690,14 +1663,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title], unique: true, name: 'on_title'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-          "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
-      EOS
+          add_index :adverts, [:title], name: :on_title, unique: true
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
@@ -1711,14 +1682,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title], name: 'my_index'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-          "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
-      EOS
+          add_index :adverts, [:title], name: :my_index
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields==["title"] }
@@ -1730,14 +1699,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title], name: 'on_title'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-          "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
-      EOS
+          add_index :adverts, [:title], name: :on_title
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
@@ -1749,14 +1716,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title], unique: true, name: 'my_index'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-          "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
-      EOS
+          add_index :adverts, [:title], name: :my_index, unique: true
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
@@ -1768,14 +1733,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-
-          add_index :adverts, [:title, :category_id], name: 'on_title_and_category_id'
-
-          #{"add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-          "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")" if defined?(Mysql2)}
-      EOS
+          add_index :adverts, [:title, :category_id], name: :on_title_and_category_id
+          #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields==["title", "category_id"] }
@@ -1800,34 +1763,24 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       Advert.reset_column_information
 
       expect(Generators::DeclareSchema::Migration::Migrator.run("adverts" => "ads")).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           rename_table :adverts, :ads
-
           add_column :ads, :title, :string, limit: 250, null: true#{charset_and_collation}
           add_column :ads, :body, :text#{', limit: 4294967295' if defined?(Mysql2)}, null: true#{charset_and_collation}
-
-          #{if defined?(SQLite3)
-                                                                                                                                                                                                                               "add_index :ads, [:id], unique: true, name: 'PRIMARY'\n"
-            elsif defined?(Mysql2)
-              "execute \"ALTER TABLE ads DROP PRIMARY KEY, ADD PRIMARY KEY (id)\"\n\n" +
-                  "add_foreign_key(\"adverts\", \"categories\", column: \"category_id\", name: \"on_category_id\")\n" +
-                  "add_foreign_key(\"adverts\", \"categories\", column: \"c_id\", name: \"on_c_id\")"
+          #{if defined?(Mysql2)
+              "add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+              "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id"
             end}
           EOS
-              .and migrate_down(<<~EOS.strip)
-          remove_column :ads, :title
-          remove_column :ads, :body
-
-          rename_table :ads, :adverts
-
-          #{if defined?(SQLite3)
-              "add_index :adverts, [:id], unique: true, name: 'PRIMARY'\n"
-            elsif defined?(Mysql2)
-              "execute \"ALTER TABLE adverts DROP PRIMARY KEY, ADD PRIMARY KEY (id)\"\n\n" +
-                  "remove_foreign_key(\"adverts\", name: \"on_category_id\")\n" +
-                  "remove_foreign_key(\"adverts\", name: \"on_c_id\")"
-            end}
-      EOS
+          .and migrate_down(<<~EOS.strip)
+            #{if defined?(Mysql2)
+                "remove_foreign_key :adverts, name: :index_adverts_on_c_id\n" +
+                "remove_foreign_key :adverts, name: :index_adverts_on_category_id"
+              end}
+            remove_column :ads, :body
+            remove_column :ads, :title
+            rename_table :ads, :adverts
+          EOS
       )
 
       # Set the table name back to what it should be and confirm we're in sync:
@@ -1854,32 +1807,18 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run("adverts" => "advertisements")).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           rename_table :adverts, :advertisements
-
           add_column :advertisements, :title, :string, limit: 250, null: true#{charset_and_collation}
           add_column :advertisements, :body, :text#{', limit: 4294967295' if defined?(Mysql2)}, null: true#{charset_and_collation}
           remove_column :advertisements, :name
-
-          #{if defined?(SQLite3)
-                                                                                                                                                                                                                                                     "add_index :advertisements, [:id], unique: true, name: 'PRIMARY'"
-            elsif defined?(Mysql2)
-              "execute \"ALTER TABLE advertisements DROP PRIMARY KEY, ADD PRIMARY KEY (id)\""
-            end}
-          EOS
-              .and migrate_down(<<~EOS.strip)
-          remove_column :advertisements, :title
+        EOS
+        .and migrate_down(<<~EOS.strip)
+          add_column :advertisements, :name, :string, limit: 250, null: true#{charset_and_collation}
           remove_column :advertisements, :body
-          add_column :adverts, :name, :string, limit: 250, null: true#{charset_and_collation}
-
+          remove_column :advertisements, :title
           rename_table :advertisements, :adverts
-
-          #{if defined?(SQLite3)
-                                                                                                           "add_index :adverts, [:id], unique: true, name: 'PRIMARY'"
-            elsif defined?(Mysql2)
-              "execute \"ALTER TABLE adverts DROP PRIMARY KEY, ADD PRIMARY KEY (id)\""
-            end}
-      EOS
+        EOS
       )
 
       ### Drop a table
@@ -1891,14 +1830,14 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       # Dropping tables is where the automatic down-migration really comes in handy:
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           drop_table :adverts
-          EOS
-              .and migrate_down(<<~EOS.strip)
+        EOS
+        .and migrate_down(<<~EOS.strip)
           create_table "adverts"#{table_options}, force: :cascade do |t|
             t.string "name", limit: 250#{charset_and_collation}
           end
-      EOS
+        EOS
       )
 
       ## STI
@@ -1923,16 +1862,14 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
       up, _ = Generators::DeclareSchema::Migration::Migrator.run do |migrations|
         expect(migrations).to(
-            migrate_up(<<~EOS.strip)
+          migrate_up(<<~EOS.strip)
             add_column :adverts, :type, :string, limit: 250, null: true#{charset_and_collation}
-
-            add_index :adverts, [:type], name: 'on_type'
-            EOS
-                .and migrate_down(<<~EOS.strip)
+            add_index :adverts, [:type], name: :on_type
+          EOS
+          .and migrate_down(<<~EOS.strip)
+            remove_index :adverts, name: :on_type
             remove_column :adverts, :type
-
-            remove_index :adverts, name: :on_type rescue ActiveRecord::StatementInvalid
-        EOS
+          EOS
         )
       end
 
@@ -1969,14 +1906,14 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run(adverts: { title: :name })).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           rename_column :adverts, :title, :name
           change_column :adverts, :name, :string, limit: 250, null: true, default: "No Name"#{charset_and_collation}
-          EOS
-              .and migrate_down(<<~EOS.strip)
+        EOS
+        .and migrate_down(<<~EOS.strip)
+          change_column :adverts, :name, :string, limit: 250, null: true, default: "Untitled"#{charset_and_collation}
           rename_column :adverts, :name, :title
-          change_column :adverts, :title, :string, limit: 250, null: true, default: "Untitled"#{charset_and_collation}
-      EOS
+        EOS
       )
 
       ### Rename a table and add a column
@@ -1991,18 +1928,11 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run(adverts: :ads)).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           rename_table :adverts, :ads
-
           add_column :ads, :created_at, :datetime, null: false
           change_column :ads, :title, :string, limit: 250, null: false, default: \"Untitled\"#{charset_and_collation}
-
-          #{if defined?(SQLite3)
-                                                                                                                                   "add_index :ads, [:id], unique: true, name: 'PRIMARY'"
-            elsif defined?(Mysql2)
-              'execute "ALTER TABLE ads DROP PRIMARY KEY, ADD PRIMARY KEY (id)"'
-            end}
-      EOS
+        EOS
       )
 
       class Advert < ActiveRecord::Base
@@ -2026,15 +1956,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run(adverts: { id: :advert_id })).to(
-          migrate_up(<<~EOS.strip)
+        migrate_up(<<~EOS.strip)
           rename_column :adverts, :id, :advert_id
-
-          #{if defined?(SQLite3)
-              "add_index :adverts, [:advert_id], unique: true, name: 'PRIMARY'"
-            elsif defined?(Mysql2)
-              'execute "ALTER TABLE adverts DROP PRIMARY KEY, ADD PRIMARY KEY (advert_id)"'
-            end}
-      EOS
+        EOS
       )
 
       nuke_model_class(Advert)
@@ -2074,6 +1998,54 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{:presence=>true, :uniqueness=>{:case_sensitive=>false}}")
     end
 
+    context 'models with the same parent foreign key relation' do
+      before do
+        class Category < ActiveRecord::Base
+          fields do
+            name :string, limit: 250, null: true
+          end
+        end
+        class Advertiser < ActiveRecord::Base
+          fields do
+            name :string, limit: 250, null: true
+          end
+          belongs_to :category, limit: 8
+        end
+        class Affiliate < ActiveRecord::Base
+          fields do
+            name :string, limit: 250, null: true
+          end
+          belongs_to :category, limit: 8
+        end
+      end
+
+      it 'will genereate unique constraint names' do
+        expect(Generators::DeclareSchema::Migration::Migrator.run).to(
+          migrate_up(<<~EOS.strip)
+          create_table :categories, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+            t.string :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+          end
+          create_table :advertisers, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+            t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+            t.integer :category_id, limit: 8, null: false
+          end
+          create_table :affiliates, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+            t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+            t.integer :category_id, limit: 8, null: false
+          end
+          add_index :advertisers, [:category_id], name: :on_category_id
+          add_index :affiliates, [:category_id], name: :on_category_id
+          add_foreign_key :advertisers, :categories, column: :category_id, name: :index_advertisers_on_category_id
+          add_foreign_key :affiliates, :categories, column: :category_id, name: :index_affiliates_on_category_id
+        EOS
+        )
+        migrate
+
+        nuke_model_class(Advertiser)
+        nuke_model_class(Affiliate)
+      end
+    end if !defined?(SQLite3) && ActiveRecord::VERSION::MAJOR >= 5
+
     describe 'serialize' do
       before do
         class Ad < ActiveRecord::Base
@@ -2258,8 +2230,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
     end
 
-    context "for Rails #{Rails::VERSION::MAJOR}" do
-      if Rails::VERSION::MAJOR >= 5
+    context "for Rails #{ActiveSupport::VERSION::MAJOR}" do
+      if ActiveSupport::VERSION::MAJOR >= 5
         let(:optional_true) { { optional: true } }
         let(:optional_false) { { optional: false } }
       else
@@ -2269,80 +2241,202 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       let(:optional_flag) { { false => optional_false, true => optional_true } }
 
       describe 'belongs_to' do
-        before do
-          unless defined?(AdCategory)
-            class AdCategory < ActiveRecord::Base
-              declare_schema { }
+        context 'with AdCategory and Advert in DB' do
+          before do
+            unless defined?(AdCategory)
+              class AdCategory < ActiveRecord::Base
+                declare_schema { }
+              end
             end
-          end
 
-          class Advert < ActiveRecord::Base
-            declare_schema do
-              string :name, limit: 250, null: true
-              integer :category_id, limit: 8
-              integer :nullable_category_id, limit: 8, null: true
+            class Advert < ActiveRecord::Base
+              declare_schema do
+                string :name, limit: 250, null: true
+                integer :category_id, limit: 8
+                integer :nullable_category_id, limit: 8, null: true
+              end
             end
+            up = Generators::DeclareSchema::Migration::Migrator.run.first
+            ActiveRecord::Migration.class_eval(up)
           end
-          up = Generators::DeclareSchema::Migration::Migrator.run.first
-          ActiveRecord::Migration.class_eval(up)
-        end
 
-        it 'passes through optional: when given' do
-          class AdvertBelongsTo < ActiveRecord::Base
-            self.table_name = 'adverts'
-            declare_schema { }
-            reset_column_information
-            belongs_to :ad_category, optional: true
-          end
-          expect(AdvertBelongsTo.reflections['ad_category'].options).to eq(optional_true)
-        end
-
-        describe 'contradictory settings' do # contradictory settings are ok--for example, during migration
-          it 'passes through optional: true, null: false' do
+          it 'passes through optional: when given' do
             class AdvertBelongsTo < ActiveRecord::Base
               self.table_name = 'adverts'
               declare_schema { }
               reset_column_information
-              belongs_to :ad_category, optional: true, null: false
+              belongs_to :ad_category, optional: true
             end
             expect(AdvertBelongsTo.reflections['ad_category'].options).to eq(optional_true)
-            expect(AdvertBelongsTo.field_specs['ad_category_id'].options&.[](:null)).to eq(false)
           end
 
-          it 'passes through optional: false, null: true' do
-            class AdvertBelongsTo < ActiveRecord::Base
-              self.table_name = 'adverts'
-              declare_schema { }
-              reset_column_information
-              belongs_to :ad_category, optional: false, null: true
+          describe 'contradictory settings' do # contradictory settings are ok--for example, during migration
+            it 'passes through optional: true, null: false' do
+              class AdvertBelongsTo < ActiveRecord::Base
+                self.table_name = 'adverts'
+                declare_schema { }
+                reset_column_information
+                belongs_to :ad_category, optional: true, null: false
+              end
+              expect(AdvertBelongsTo.reflections['ad_category'].options).to eq(optional_true)
+              expect(AdvertBelongsTo.field_specs['ad_category_id'].options&.[](:null)).to eq(false)
             end
-            expect(AdvertBelongsTo.reflections['ad_category'].options).to eq(optional_false)
-            expect(AdvertBelongsTo.field_specs['ad_category_id'].options&.[](:null)).to eq(true)
+
+            it 'passes through optional: false, null: true' do
+              class AdvertBelongsTo < ActiveRecord::Base
+                self.table_name = 'adverts'
+                declare_schema { }
+                reset_column_information
+                belongs_to :ad_category, optional: false, null: true
+              end
+              expect(AdvertBelongsTo.reflections['ad_category'].options).to eq(optional_false)
+              expect(AdvertBelongsTo.field_specs['ad_category_id'].options&.[](:null)).to eq(true)
+            end
+          end
+
+          [false, true].each do |nullable|
+            context "nullable=#{nullable}" do
+              it 'infers optional: from null:' do
+                eval <<~EOS
+                  class AdvertBelongsTo < ActiveRecord::Base
+                    declare_schema { }
+                    belongs_to :ad_category, null: #{nullable}
+                  end
+                EOS
+                expect(AdvertBelongsTo.reflections['ad_category'].options).to eq(optional_flag[nullable])
+                expect(AdvertBelongsTo.field_specs['ad_category_id'].options&.[](:null)).to eq(nullable)
+              end
+
+              it 'infers null: from optional:' do
+                eval <<~EOS
+                  class AdvertBelongsTo < ActiveRecord::Base
+                    declare_schema { }
+                    belongs_to :ad_category, optional: #{nullable}
+                  end
+                EOS
+                expect(AdvertBelongsTo.reflections['ad_category'].options).to eq(optional_flag[nullable])
+                expect(AdvertBelongsTo.field_specs['ad_category_id'].options&.[](:null)).to eq(nullable)
+              end
+            end
+          end
+
+          it 'deprecates limit:' do
+            expect(ActiveSupport::Deprecation).to receive(:warn).with("belongs_to limit: is deprecated since it is now inferred")
+            eval <<~EOS
+              class UsingLimit < ActiveRecord::Base
+                declare_schema { }
+                belongs_to :ad_category, limit: 4
+              end
+            EOS
           end
         end
 
-        [false, true].each do |nullable|
-          context "nullable=#{nullable}" do
-            it 'infers optional: from null:' do
-              eval <<~EOS
-                class AdvertBelongsTo < ActiveRecord::Base
-                  declare_schema { }
-                  belongs_to :ad_category, null: #{nullable}
-                end
-              EOS
-              expect(AdvertBelongsTo.reflections['ad_category'].options).to eq(optional_flag[nullable])
-              expect(AdvertBelongsTo.field_specs['ad_category_id'].options&.[](:null)).to eq(nullable)
+        context 'when parent object PKs have different limits' do
+          before do
+            class IdDefault < ActiveRecord::Base
+              declare_schema { }
+            end
+            class Id4 < ActiveRecord::Base
+              declare_schema id: :integer do
+              end
             end
+            class Id8 < ActiveRecord::Base
+              declare_schema id: :bigint do
+              end
+            end
+            class Fk < ActiveRecord::Base
+              declare_schema { }
+              belongs_to :id_default, (ActiveSupport::VERSION::MAJOR < 5 ? { constraint: false } : {})
+              belongs_to :id4, (ActiveSupport::VERSION::MAJOR < 5 ? { constraint: false } : {})
+              belongs_to :id8, (ActiveSupport::VERSION::MAJOR < 5 ? { constraint: false } : {})
+            end
+          end
 
-            it 'infers null: from optional:' do
-              eval <<~EOS
-                class AdvertBelongsTo < ActiveRecord::Base
-                  declare_schema { }
-                  belongs_to :ad_category, optional: #{nullable}
-                end
-              EOS
-              expect(AdvertBelongsTo.reflections['ad_category'].options).to eq(optional_flag[nullable])
-              expect(AdvertBelongsTo.field_specs['ad_category_id'].options&.[](:null)).to eq(nullable)
+          it 'creates the proper PKs' do
+            up = Generators::DeclareSchema::Migration::Migrator.run.first
+
+            create_id4_defaults = up.split("\n").grep(/create_table :id_defaults/).first
+            expect(create_id4_defaults).to be, up
+            expect(create_id4_defaults).to match(/, id: :bigint/)
+
+            create_id4s = up.split("\n").grep(/create_table :id4s/).first
+            expect(create_id4s).to be, up
+            expect(create_id4s).to match(/, id: :integer/)
+
+            create_id8s = up.split("\n").grep(/create_table :id8s/).first
+            expect(create_id8s).to be, up
+            expect(create_id8s).to match(/, id: :bigint/)
+          end
+
+          it 'infers the correct FK type from the create_table id: type' do
+            up = Generators::DeclareSchema::Migration::Migrator.run.first
+
+            create_fks = up.split("\n").grep(/t\.integer /).map { |command| command.gsub(', null: false', '').gsub(/^ +/, '') }
+            if defined?(SQLite3)
+              create_fks.map! { |command| command.gsub(/limit: [a-z0-9]+/, 'limit: X') }
+              expect(create_fks).to eq([
+                                         't.integer :id_default_id, limit: X',
+                                         't.integer :id4_id, limit: X',
+                                         't.integer :id8_id, limit: X'
+                                       ]), up
+            else
+              expect(create_fks).to eq([
+                                         't.integer :id_default_id, limit: 8',
+                                         't.integer :id4_id, limit: 4',
+                                         't.integer :id8_id, limit: 8'
+                                       ]), up
+            end
+          end
+
+          context "when parent objects were migrated before and later definitions don't have explicit id:" do
+            before do
+              up = Generators::DeclareSchema::Migration::Migrator.run.first
+              ActiveRecord::Migration.class_eval up
+              nuke_model_class(IdDefault)
+              nuke_model_class(Id4)
+              nuke_model_class(Id8)
+              nuke_model_class(Fk)
+              ActiveRecord::Base.connection.schema_cache.clear!
+
+
+              class NewIdDefault < ActiveRecord::Base
+                self.table_name = 'id_defaults'
+                declare_schema { }
+              end
+              class NewId4 < ActiveRecord::Base
+                self.table_name = 'id4s'
+                declare_schema { }
+              end
+              class NewId8 < ActiveRecord::Base
+                self.table_name = 'id8s'
+                declare_schema { }
+              end
+              class NewFk < ActiveRecord::Base
+                declare_schema { }
+                belongs_to :new_id_default
+                belongs_to :new_id4
+                belongs_to :new_id8
+              end
+            end
+
+            it 'infers the correct FK :integer limit: ' do
+              up = Generators::DeclareSchema::Migration::Migrator.run.first
+
+              create_fks = up.split("\n").grep(/t\.integer /).map { |command| command.gsub(', null: false', '').gsub(/^ +/, '') }
+              if defined?(SQLite3)
+                create_fks.map! { |command| command.gsub(/limit: [a-z0-9]+/, 'limit: X') }
+                expect(create_fks).to eq([
+                                           't.integer :new_id_default_id, limit: X',
+                                           't.integer :new_id4_id, limit: X',
+                                           't.integer :new_id8_id, limit: X'
+                                         ]), up
+              else
+                expect(create_fks).to eq([
+                                           't.integer :new_id_default_id, limit: 8',
+                                           't.integer :new_id4_id, limit: 4',
+                                           't.integer :new_id8_id, limit: 8'
+                                         ]), up
+              end
             end
           end
         end
@@ -2365,13 +2459,13 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         migration_content = File.read(migrations.first)
         first_line = migration_content.split("\n").first
         base_class = first_line.split(' < ').last
-        expect(base_class).to eq("(Rails::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)")
+        expect(base_class).to eq("(ActiveSupport::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)")
       end
     end
 
     context 'Does not generate migrations' do
       it 'for aliased fields bigint -> integer limit 8' do
-        if Rails::VERSION::MAJOR >= 5 || !ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
+        if ActiveSupport::VERSION::MAJOR >= 5 || !ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
           class Advert < active_record_base_class.constantize
             declare_schema do
               bigint :price
@@ -2383,7 +2477,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           migrations = Dir.glob('db/migrate/*declare_schema_migration*.rb')
           expect(migrations.size).to eq(1), migrations.inspect
 
-          if defined?(Mysql2) && Rails::VERSION::MAJOR < 5
+          if defined?(Mysql2) && ActiveSupport::VERSION::MAJOR < 5
             ActiveRecord::Base.connection.execute("ALTER TABLE adverts ADD PRIMARY KEY (id)")
           end