declare_schema 0.6.1 → 0.7.1

data/spec/lib/declare_schema/field_declaration_dsl_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe DeclareSchema::FieldDeclarationDsl do
   end
 
   it 'stores limits' do
-    expect(TestModel.field_specs['name'].limit).to eq(127)
+    expect(TestModel.field_specs['name'].limit).to eq(127), TestModel.field_specs['name'].inspect
   end
 
   # TODO: fill out remaining tests

data/spec/lib/declare_schema/field_spec_spec.rb

@@ -1,69 +1,173 @@
 # frozen_string_literal: true
 
-RSpec.describe 'DeclareSchema Model FieldSpec' do
+begin
+  require 'mysql2'
+rescue LoadError
+end
+
+RSpec.describe DeclareSchema::Model::FieldSpec do
+  let(:model) { double('model', table_options: {}) }
+  let(:col_spec) { double('col_spec', sql_type: 'varchar') }
+
   before do
     load File.expand_path('prepare_testapp.rb', __dir__)
+
+    if Rails::VERSION::MAJOR < 5
+      allow(col_spec).to receive(:type_cast_from_database, &:itself)
+    end
   end
 
-  context 'There are no model columns to change' do
-    it '#different_to should return false for int8 == int8' do
-      subject = DeclareSchema::Model::FieldSpec.new(Object, :price, :integer, limit: 8, null: false, position: 0)
+  describe '#initialize' do
+    it 'normalizes option order' do
+      subject = described_class.new(model, :price, :integer, anonymize_using: 'x', null: false, position: 0, limit: 4)
+      expect(subject.options.keys).to eq([:limit, :null, :anonymize_using])
+    end
+  end
 
-      case Rails::VERSION::MAJOR
-      when 4
-        cast_type = ActiveRecord::Type::Integer.new(limit: 8)
-        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "integer(8)", false)
-      else
-        sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "integer(8)", type: :integer, limit: 8)
-        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
+  describe '#schema_attributes' do
+    describe 'integer 4' do
+      it 'returns schema attributes' do
+        subject = described_class.new(model, :price, :integer, limit: 4, null: false, position: 0)
+        expect(subject.schema_attributes(col_spec)).to eq(type: :integer, limit: 4, null: false)
       end
-
-      expect(subject.different_to?(subject.name, col)).to eq(false)
     end
 
-    it '#different_to should return false for bigint == bigint' do
-      subject = DeclareSchema::Model::FieldSpec.new(Object, :price, :bigint, null: false, position: 0)
+    describe 'integer 8' do
+      it 'returns schema attributes' do
+        subject = described_class.new(model, :price, :integer, limit: 8, null: true, position: 2)
+        expect(subject.schema_attributes(col_spec)).to eq(type: :integer, limit: 8, null: true)
+      end
+    end
 
-      case Rails::VERSION::MAJOR
-      when 4
-        cast_type = ActiveRecord::Type::BigInteger.new(limit: 8)
-        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "bigint(20)", false)
-      else
-        sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "bigint(20)", type: :integer, limit: 8)
-        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
+    describe 'bigint' do
+      it 'returns schema attributes' do
+        subject = described_class.new(model, :price, :bigint, null: false, position: 2)
+        expect(subject.schema_attributes(col_spec)).to eq(type: :integer, limit: 8, null: false)
       end
+    end
 
-      expect(subject.different_to?(subject.name, col)).to eq(false)
+    describe 'string' do
+      it 'returns schema attributes (including charset/collation iff mysql)' do
+        subject = described_class.new(model, :title, :string, limit: 100, null: true, charset: 'utf8mb4', position: 0)
+        if defined?(Mysql2)
+          expect(subject.schema_attributes(col_spec)).to eq(type: :string, limit: 100, null: true, charset: 'utf8mb4', collation: 'utf8mb4_bin')
+        else
+          expect(subject.schema_attributes(col_spec)).to eq(type: :string, limit: 100, null: true)
+        end
+      end
     end
 
-    it '#different_to should return false for int8 == bigint' do
-      subject = DeclareSchema::Model::FieldSpec.new(Object, :price, :integer, limit: 8, null: false, position: 0)
+    describe 'text' do
+      it 'returns schema attributes (including charset/collation iff mysql)' do
+        subject = described_class.new(model, :title, :text, limit: 200, null: true, charset: 'utf8mb4', position: 2)
+        if defined?(Mysql2)
+          expect(subject.schema_attributes(col_spec)).to eq(type: :text, limit: 255, null: true, charset: 'utf8mb4', collation: 'utf8mb4_bin')
+        else
+          expect(subject.schema_attributes(col_spec)).to eq(type: :text, null: true)
+        end
+      end
 
-      case Rails::VERSION::MAJOR
-      when 4
-        cast_type = ActiveRecord::Type::BigInteger.new(limit: 8)
-        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "bigint(20)", false)
-      else
-        sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "bigint(20)", type: :integer, limit: 8)
-        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
+      it 'allows a default to be set unless mysql' do
+        if defined?(Mysql2)
+          expect do
+            described_class.new(model, :title, :text, limit: 200, null: true, default: 'none', charset: 'utf8mb4', position: 2)
+          end.to raise_exception(DeclareSchema::MysqlTextMayNotHaveDefault)
+        else
+          subject = described_class.new(model, :title, :text, limit: 200, null: true, default: 'none', charset: 'utf8mb4', position: 2)
+          expect(subject.schema_attributes(col_spec)).to eq(type: :text, null: true, default: 'none')
+        end
       end
 
-      expect(subject.different_to?(subject.name, col)).to eq(false)
+      describe 'decimal' do
+        it 'allows precision: and scale:' do
+          subject = described_class.new(model, :quantity, :decimal, precision: 8, scale: 10, null: true, position: 3)
+          expect(subject.schema_attributes(col_spec)).to eq(type: :decimal, precision: 8, scale: 10, null: true)
+        end
+
+        it 'requires precision:' do
+          expect_any_instance_of(described_class).to receive(:warn).with(/precision: required for :decimal type/)
+          described_class.new(model, :quantity, :decimal, scale: 10, null: true, position: 3)
+        end
+
+        it 'requires scale:' do
+          expect_any_instance_of(described_class).to receive(:warn).with(/scale: required for :decimal type/)
+          described_class.new(model, :quantity, :decimal, precision: 8, null: true, position: 3)
+        end
+      end
+
+      [:integer, :bigint, :string, :text, :binary, :datetime, :date, :time].each do |t|
+        describe t.to_s do
+          let(:extra) { t == :string ? { limit: 100 } : {} }
+
+          it 'does not allow precision:' do
+            expect_any_instance_of(described_class).to receive(:warn).with(/precision: only allowed for :decimal type/)
+            described_class.new(model, :quantity, t, { precision: 8, null: true, position: 3 }.merge(extra))
+          end unless t == :datetime
+
+          it 'does not allow scale:' do
+            expect_any_instance_of(described_class).to receive(:warn).with(/scale: only allowed for :decimal type/)
+            described_class.new(model, :quantity, t, { scale: 10, null: true, position: 3 }.merge(extra))
+          end
+        end
+      end
+    end
+
+    describe 'datetime' do
+      it 'keeps type as "datetime"' do
+        subject = described_class.new(model, :created_at, :datetime, null: false, position: 1)
+        expect(subject.schema_attributes(col_spec)).to eq(type: :datetime, null: false)
+      end
+    end
+
+    describe 'timestamp' do
+      it 'normalizes type to "datetime"' do
+        subject = described_class.new(model, :created_at, :timestamp, null: true, position: 2)
+        expect(subject.schema_attributes(col_spec)).to eq(type: :datetime, null: true)
+      end
     end
 
-    it '#different_to should return false for bigint == int8' do
-      subject = DeclareSchema::Model::FieldSpec.new(Object, :price, :bigint, null: false, position: 0)
+    describe 'default:' do
+      let(:col_spec) { double('col_spec', sql_type: :integer) }
+
+      it 'typecasts default value' do
+        allow(col_spec).to receive(:type_cast_from_database) { |default| Integer(default) }
+        subject = described_class.new(model, :price, :integer, limit: 4, default: '42', null: true, position: 2)
+        expect(subject.schema_attributes(col_spec)).to eq(type: :integer, limit: 4, default: 42, null: true)
+      end
+    end
+  end
 
+  describe '#schema_attributes' do
+    let(:col_spec) do
       case Rails::VERSION::MAJOR
       when 4
         cast_type = ActiveRecord::Type::Integer.new(limit: 8)
-        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "integer(8)", false)
+        ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "integer(8)", false)
       else
         sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "integer(8)", type: :integer, limit: 8)
-        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
+        ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
       end
+    end
+
+    it 'returns the attributes except name, position, and non-SQL options' do
+      subject = described_class.new(model, :price, :bigint, null: true, default: 0, ruby_default: -> { }, encrypt_using: -> { }, position: 2)
+      expect(subject.schema_attributes(col_spec)).to eq(type: :integer, limit: 8, null: true, default: 0)
+    end
+
+    it 'aliases :bigint and :integer limit: 8' do
+      int8 = described_class.new(model, :price, :integer, limit: 8, null: false, position: 0)
+      bigint = described_class.new(model, :price, :bigint,          null: false, position: 0)
+
+      expected_attributes = { type: :integer, limit: 8, null: false }
+      expect(int8.schema_attributes(col_spec)).to eq(expected_attributes)
+      expect(bigint.schema_attributes(col_spec)).to eq(expected_attributes)
+    end
+  end
 
-      expect(subject.different_to?(subject.name, col)).to eq(false)
+  describe '#sql_options' do
+    subject { described_class.new(model, :price, :integer, limit: 4, null: true, default: 0, position: 2, encrypt_using: ->(field) { field }) }
+    it 'excludes non-sql options' do
+      expect(subject.sql_options).to eq(limit: 4, null: true, default: 0)
     end
   end
 end

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -47,6 +47,13 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       ", id: :integer" unless Rails::VERSION::MAJOR < 5
     end
   end
+  let(:lock_version_limit) do
+    if defined?(Mysql2)
+      ", limit: 4"
+    else
+      ''
+    end
+  end
 
   # DeclareSchema - Migration Generator
   it 'generates migrations' do
@@ -74,7 +81,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(migrations).to(
         migrate_up(<<~EOS.strip)
           create_table :adverts, id: :bigint do |t|
-            t.string :name, limit: 250#{charset_and_collation}
+            t.string :name, limit: 250, null: true#{charset_and_collation}
           end#{charset_alter_table}
         EOS
         .and migrate_down("drop_table :adverts")
@@ -107,8 +114,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(migrate).to(
       migrate_up(<<~EOS.strip)
-        add_column :adverts, :body, :text#{text_limit}#{charset_and_collation}
-        add_column :adverts, :published_at, :datetime
+        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
@@ -126,7 +133,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(migrate).to(
       migrate_up("remove_column :adverts, :published_at").and(
-        migrate_down("add_column :adverts, :published_at, :datetime#{datetime_precision}")
+        migrate_down("add_column :adverts, :published_at, :datetime#{datetime_precision}, null: true")
       )
     )
 
@@ -140,12 +147,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
       migrate_up(<<~EOS.strip)
-        add_column :adverts, :title, :string, limit: 250#{charset_and_collation}
+        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
-        add_column :adverts, :name, :string, limit: 250#{charset_and_collation}
+        add_column :adverts, :name, :string, limit: 250, null: true#{charset_and_collation}
       EOS
     )
 
@@ -165,8 +172,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     end
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-      migrate_up("change_column :adverts, :title, :text#{text_limit}#{charset_and_collation}").and(
-        migrate_down("change_column :adverts, :title, :string, limit: 250#{charset_and_collation}")
+      migrate_up("change_column :adverts, :title, :text#{text_limit}, null: true#{charset_and_collation}").and(
+        migrate_down("change_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}")
       )
     )
 
@@ -179,10 +186,10 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(migrate).to(
       migrate_up(<<~EOS.strip)
-        change_column :adverts, :title, :string, limit: 250, default: "Untitled"#{charset_and_collation}
+        change_column :adverts, :title, :string, limit: 250, null: true, default: "Untitled"#{charset_and_collation}
       EOS
       .and migrate_down(<<~EOS.strip)
-        change_column :adverts, :title, :string, limit: 250#{charset_and_collation}
+        change_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
       EOS
     )
 
@@ -195,7 +202,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     end
 
     up, _ = Generators::DeclareSchema::Migration::Migrator.run.tap do |migrations|
-      expect(migrations).to migrate_up("add_column :adverts, :price, :integer, limit: 2")
+      expect(migrations).to migrate_up("add_column :adverts, :price, :integer, limit: 2, null: true")
     end
 
     # Now run the migration, then change the limit:
@@ -209,24 +216,20 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
       migrate_up(<<~EOS.strip)
-        change_column :adverts, :price, :integer, limit: 3
+        change_column :adverts, :price, :integer, limit: 3, null: true
       EOS
       .and migrate_down(<<~EOS.strip)
-        change_column :adverts, :price, :integer, limit: 2
+        change_column :adverts, :price, :integer, limit: 2, null: true
       EOS
     )
 
-    # Note that limit on a decimal column is ignored (use :scale and :precision)
-
     ActiveRecord::Migration.class_eval("remove_column :adverts, :price")
     class Advert < ActiveRecord::Base
       fields do
-        price :decimal, null: true, limit: 4
+        price :decimal, precision: 4, scale: 1, null: true
       end
     end
 
-    expect(Generators::DeclareSchema::Migration::Migrator.run).to migrate_up("add_column :adverts, :price, :decimal")
-
     # Limits are generally not needed for `text` fields, because by default, `text` fields will use the maximum size
     # allowed for that database type (0xffffffff for LONGTEXT in MySQL unlimited in Postgres, 1 billion in Sqlite).
     # If a `limit` is given, it will only be used in MySQL, to choose the smallest TEXT field that will accommodate
@@ -245,9 +248,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
       migrate_up(<<~EOS.strip)
-        add_column :adverts, :price, :decimal
-        add_column :adverts, :notes, :text, null: false#{text_limit}#{charset_and_collation}
-        add_column :adverts, :description, :text, null: false#{', limit: 65535' if defined?(Mysql2)}#{charset_and_collation}
+        add_column :adverts, :price, :decimal, precision: 4, scale: 1, null: true
+        add_column :adverts, :notes, :text#{text_limit}, null: false#{charset_and_collation}
+        add_column :adverts, :description, :text#{', limit: 65535' if defined?(Mysql2)}, null: false#{charset_and_collation}
       EOS
     )
 
@@ -269,8 +272,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
-          add_column :adverts, :notes, :text, null: false, limit: 4294967295#{charset_and_collation}
-          add_column :adverts, :description, :text, null: false, limit: 255#{charset_and_collation}
+          add_column :adverts, :notes, :text, limit: 4294967295, null: false#{charset_and_collation}
+          add_column :adverts, :description, :text, limit: 255, null: false#{charset_and_collation}
         EOS
       )
 
@@ -313,7 +316,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           change_column :adverts, :description, :text, limit: 4294967295, null: false#{charset_and_collation}
         EOS
         .and migrate_down(<<~EOS.strip)
-          change_column :adverts, :description, :text#{', limit: 255' if defined?(Mysql2)}#{charset_and_collation}
+          change_column :adverts, :description, :text#{', limit: 255' if defined?(Mysql2)}, null: true#{charset_and_collation}
         EOS
       )
 
@@ -330,7 +333,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           change_column :adverts, :description, :text, limit: 4294967295, null: false#{charset_and_collation}
         EOS
         .and migrate_down(<<~EOS.strip)
-          change_column :adverts, :description, :text#{', limit: 255' if defined?(Mysql2)}#{charset_and_collation}
+          change_column :adverts, :description, :text#{', limit: 255' if defined?(Mysql2)}, null: true#{charset_and_collation}
         EOS
       )
     end
@@ -369,14 +372,14 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
         add_index :adverts, [:category_id], name: 'on_category_id'
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" if defined?(Mysql2)}
+        #{"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_column :adverts, :category_id
 
         remove_index :adverts, name: :on_category_id rescue ActiveRecord::StatementInvalid
 
-        #{"remove_foreign_key('adverts', name: '')\n" if defined?(Mysql2)}
+        #{"remove_foreign_key(\"adverts\", name: \"index_adverts_on_category_id\")\n" if defined?(Mysql2)}
       EOS
     )
 
@@ -397,8 +400,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
         add_index :adverts, [:c_id], name: 'on_c_id'
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" +
-          "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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
     )
 
@@ -417,8 +420,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       migrate_up(<<~EOS.strip)
         add_column :adverts, :category_id, :integer, limit: 8, null: false
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" +
-          "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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
     )
 
@@ -439,8 +442,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
         add_index :adverts, [:category_id], name: 'my_index'
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" +
-          "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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
     )
 
@@ -461,20 +464,20 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
       migrate_up(<<~EOS.strip)
-        add_column :adverts, :created_at, :datetime
-        add_column :adverts, :updated_at, :datetime
-        add_column :adverts, :lock_version, :integer, null: false, default: 1
+        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
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" +
-          "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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_column :adverts, :lock_version
 
-        #{"remove_foreign_key('adverts', name: '')\n" +
-          "remove_foreign_key('adverts', name: '')" if defined?(Mysql2)}
+        #{"remove_foreign_key(\"adverts\", name: \"index_adverts_on_category_id\")\n" +
+          "remove_foreign_key(\"adverts\", name: \"index_adverts_on_c_id\")" if defined?(Mysql2)}
       EOS
     )
 
@@ -494,12 +497,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
       migrate_up(<<~EOS.strip)
-        add_column :adverts, :title, :string, limit: 250#{charset_and_collation}
+        add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
 
         add_index :adverts, [:title], name: 'on_title'
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" +
-          "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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
     )
 
@@ -515,12 +518,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
       migrate_up(<<~EOS.strip)
-        add_column :adverts, :title, :string, limit: 250#{charset_and_collation}
+        add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
 
         add_index :adverts, [:title], unique: true, name: 'on_title'
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" +
-          "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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
     )
 
@@ -536,12 +539,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
       migrate_up(<<~EOS.strip)
-        add_column :adverts, :title, :string, limit: 250#{charset_and_collation}
+        add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
 
         add_index :adverts, [:title], name: 'my_index'
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" +
-          "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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
     )
 
@@ -555,12 +558,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
       migrate_up(<<~EOS.strip)
-        add_column :adverts, :title, :string, limit: 250#{charset_and_collation}
+        add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
 
         add_index :adverts, [:title], name: 'on_title'
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" +
-          "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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
     )
 
@@ -574,12 +577,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
       migrate_up(<<~EOS.strip)
-        add_column :adverts, :title, :string, limit: 250#{charset_and_collation}
+        add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
 
         add_index :adverts, [:title], unique: true, name: 'my_index'
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" +
-          "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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
     )
 
@@ -593,12 +596,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(Generators::DeclareSchema::Migration::Migrator.run).to(
       migrate_up(<<~EOS.strip)
-        add_column :adverts, :title, :string, limit: 250#{charset_and_collation}
+        add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
 
         add_index :adverts, [:title, :category_id], name: 'on_title_and_category_id'
 
-        #{"execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\n" +
-          "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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
     )
 
@@ -627,14 +630,15 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       migrate_up(<<~EOS.strip)
         rename_table :adverts, :ads
 
-        add_column :ads, :title, :string, limit: 250#{charset_and_collation}
-        add_column :ads, :body, :text#{', limit: 4294967295' if defined?(Mysql2)}#{charset_and_collation}
+        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" +
-            "execute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_category_id FOREIGN KEY index_adverts_on_category_id(category_id) REFERENCES categories(id) \"\nexecute \"ALTER TABLE adverts ADD CONSTRAINT index_adverts_on_c_id FOREIGN KEY index_adverts_on_c_id(c_id) REFERENCES categories(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\")"
           end}
       EOS
       .and migrate_down(<<~EOS.strip)
@@ -647,8 +651,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
             "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: '')\n" +
-            "remove_foreign_key('adverts', name: '')"
+            "remove_foreign_key(\"adverts\", name: \"index_adverts_on_category_id\")\n" +
+            "remove_foreign_key(\"adverts\", name: \"index_adverts_on_c_id\")"
           end}
       EOS
     )
@@ -680,8 +684,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       migrate_up(<<~EOS.strip)
         rename_table :adverts, :advertisements
 
-        add_column :advertisements, :title, :string, limit: 250#{charset_and_collation}
-        add_column :advertisements, :body, :text#{', limit: 4294967295' if defined?(Mysql2)}#{charset_and_collation}
+        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)
@@ -693,7 +697,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       .and migrate_down(<<~EOS.strip)
         remove_column :advertisements, :title
         remove_column :advertisements, :body
-        add_column :adverts, :name, :string, limit: 250#{charset_and_collation}
+        add_column :adverts, :name, :string, limit: 250, null: true#{charset_and_collation}
 
         rename_table :advertisements, :adverts
 
@@ -747,7 +751,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     up, _ = Generators::DeclareSchema::Migration::Migrator.run do |migrations|
       expect(migrations).to(
         migrate_up(<<~EOS.strip)
-          add_column :adverts, :type, :string, limit: 250#{charset_and_collation}
+          add_column :adverts, :type, :string, limit: 250, null: true#{charset_and_collation}
 
           add_index :adverts, [:type], name: 'on_type'
         EOS
@@ -794,11 +798,11 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     expect(Generators::DeclareSchema::Migration::Migrator.run(adverts: { title: :name })).to(
       migrate_up(<<~EOS.strip)
         rename_column :adverts, :title, :name
-        change_column :adverts, :name, :string, limit: 250, default: "No Name"#{charset_and_collation}
+        change_column :adverts, :name, :string, limit: 250, null: true, default: "No Name"#{charset_and_collation}
       EOS
       .and migrate_down(<<~EOS.strip)
         rename_column :adverts, :name, :title
-        change_column :adverts, :title, :string, limit: 250, default: "Untitled"#{charset_and_collation}
+        change_column :adverts, :title, :string, limit: 250, null: true, default: "Untitled"#{charset_and_collation}
       EOS
     )