declare_schema 0.10.0 → 0.10.1

data/spec/lib/declare_schema/interactive_primary_key_spec.rb

@@ -36,7 +36,32 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
 
       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
         # replace custom primary_key
@@ -49,12 +74,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._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("")
       end
     end
   end
@@ -85,7 +104,32 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
 
       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
         # replace custom primary_key
@@ -99,12 +143,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

@@ -10,16 +10,6 @@ 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,6 +20,11 @@ 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
       ', precision: 0'
@@ -81,9 +76,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")
         )
@@ -119,8 +114,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 +147,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 +365,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: :on_category_id" if defined?(Mysql2)}
         EOS
         .and migrate_down(<<~EOS.strip)
+          #{"remove_foreign_key :adverts, name: :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 +389,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -420,9 +409,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -440,11 +428,9 @@ 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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -468,17 +454,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: :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
+          #{"remove_foreign_key :adverts, name: :on_c_id\n" +
+            "remove_foreign_key :adverts, name: :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 +483,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -520,11 +502,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -541,11 +521,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -560,11 +538,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -579,11 +555,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -598,11 +572,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
         EOS
       )
 
@@ -614,7 +586,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 +603,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: :on_category_id\n" +
+              "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id"
             end}
         EOS
         .and migrate_down(<<~EOS.strip)
-          remove_column :ads, :title
+          #{if defined?(Mysql2)
+              "remove_foreign_key :adverts, name: :on_c_id\n" +
+              "remove_foreign_key :adverts, name: :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 +647,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 +702,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 +749,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 +768,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 +796,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
       )
 
@@ -1252,12 +1186,12 @@ 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
 
@@ -1286,14 +1220,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 +1253,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 +1474,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: :on_category_id\n" if defined?(Mysql2)}
+        EOS
+        .and migrate_down(<<~EOS.strip)
+          #{"remove_foreign_key :adverts, name: :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 +1498,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.field_specs.delete(:c_id)
@@ -1590,12 +1518,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
+       EOS
       )
 
       Advert.field_specs.delete(:category_id)
@@ -1610,14 +1537,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.field_specs.delete(:category_id)
@@ -1636,22 +1561,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: :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_foreign_key :adverts, name: :on_c_id\n" +
+            "remove_foreign_key :adverts, name: :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 +1592,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields==["title"] }
@@ -1690,14 +1611,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
@@ -1711,14 +1630,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields==["title"] }
@@ -1730,14 +1647,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
@@ -1749,14 +1664,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
@@ -1768,14 +1681,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: :on_category_id\n" +
+            "add_foreign_key :adverts, :categories, column: :c_id, name: :on_c_id" if defined?(Mysql2)}
+        EOS
       )
 
       Advert.index_definitions.delete_if { |spec| spec.fields==["title", "category_id"] }
@@ -1800,34 +1711,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: :on_category_id\n" +
+              "add_foreign_key :adverts, :categories, column: :c_id, name: :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: :on_c_id\n" +
+                "remove_foreign_key :adverts, name: :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 +1755,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 +1778,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 +1810,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 +1854,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 +1876,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 +1904,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)