declare_schema 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a529991bad5ab16728f11b3f6c165b62853c3b68713e0ec69d6370d7d3c0e5b
-  data.tar.gz: 6a131f8af82b018b843f639e501371cf0db9a65b91a4acb99aea44d3eb1674d9
+  metadata.gz: 516d119d979224ddbe841b2dd5117fc5891b5c79e09261443c7df6f3c2335910
+  data.tar.gz: 32621c93b56814f9a8dd30b2d622d2c6a4c536cdc40b2145d078134252e14401
 SHA512:
-  metadata.gz: 655ab291337bf8f11fb249de1b97608e7ff73b14ff543f9248e3f92d9bf1770553b8bc2f962c72e8763d27ae559c35bdff1f12f4b6b460a1d46abfab00e931c0
-  data.tar.gz: b67d3340bb42b91bddd0940e0a9e5a895bd57f2017ef8d4712e1e4331ba46e78b17d9f7e9b0e60de9f921232897c0edeffe37621060632ecb18267db1ce15dc0
+  metadata.gz: 912c885f9fea463bae49937b6cb85ba6f7ab8cd4739327e6c662eb7b3cece701e1d42be9f251b97ba4a7b544eddd2a854a99ad8992d4a1fa5563acfd81cff989
+  data.tar.gz: 7429b27a56a0cfc27f8af16216528ee7137e5f9d0f20301f5c6177decc816c09b663bf78e5ea22d955b03ed58a7a103663980ec08ab14bb2d27f6d6ccb581787

data/CHANGELOG.md

@@ -4,6 +4,16 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.11.0] - 2021-03-22
+### Removed
+- Removed `g|m|c` prompt entirely, since it was confusing. Instead, the migration is
+ always generated; the user may press ^C at the filename prompt to cancel.
+ The migration will be run if `--migrate` is passed; otherwise, the migrate command will be displayed to be run later.
+### Added
+- Added the new configuration option `DeclareSchema.@db_migrate_command =`.
+### Fixed 
+- Fixed bug where foreign key constraint names are not globally unique
+
 ## [0.10.1] - 2021-03-18
 ### Fixed
 - Migration steps are now generated in a defined dependency order, so that--for example--indexes that depend
@@ -154,6 +164,7 @@ using the appropriate Rails configuration attributes.
 ### Added
 - Initial version from https://github.com/Invoca/hobo_fields v4.1.0.
 
+[0.11.0]: https://github.com/Invoca/declare_schema/compare/v0.10.1...v0.11.0
 [0.10.1]: https://github.com/Invoca/declare_schema/compare/v0.10.0...v0.10.1
 [0.10.0]: https://github.com/Invoca/declare_schema/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/Invoca/declare_schema/compare/v0.8.0...v0.9.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.10.1)
+    declare_schema (0.11.0)
       rails (>= 4.2)
 
 GEM

data/README.md

@@ -57,7 +57,7 @@ during the initialization of your Rails application.
 
 ### before_generating_migration callback
 
-During the initializtion process for generating migrations, `DeclareSchema` will
+During the initialization process for generating migrations, `DeclareSchema` will
 trigger the `eager_load!` on the `Rails` application and all `Rails::Engine`s loaded
 into scope.  If you need to generate migrations for models that aren't automatically loaded by `eager_load!`,
 load them in the `before_generating_migration` block.
@@ -163,6 +163,16 @@ turn all tables into `utf8mb4` supporting tables:
 DeclareSchema.default_charset   = "utf8mb4"
 DeclareSchema.default_collation = "utf8mb4_bin"
 ```
+#### db:migrate Command
+`declare_schema` can run the migration once it is generated, if the `--migrate` option is passed.
+If not, it will display the command to run later. By default this command is
+```
+bundle exec rails db:migrate
+```
+If your repo has a different command to run for migrations, you can configure it like this:
+```ruby
+`DeclareSchema.db_migrate_command = "bundle exec rails db:migrate_immediate"`
+```
 
 ## Declaring Character Set and Collation
 _Note: This feature currently only works for MySQL database configurations._

data/lib/declare_schema.rb

@@ -28,10 +28,16 @@ module DeclareSchema
   @default_null                  = false
   @default_generate_foreign_keys = true
   @default_generate_indexing     = true
+  @db_migrate_command            =
+    if ActiveSupport::VERSION::MAJOR < 5
+      "bundle exec rake db:migrate"
+    else
+      "bundle exec rails db:migrate"
+    end
 
   class << self
     attr_reader :default_charset, :default_collation, :default_text_limit, :default_string_limit, :default_null,
-                :default_generate_foreign_keys, :default_generate_indexing
+                :default_generate_foreign_keys, :default_generate_indexing, :db_migrate_command
 
     def to_class(type)
       case type
@@ -78,6 +84,11 @@ module DeclareSchema
       generate_indexing.in?([true, false]) or raise ArgumentError, "generate_indexing must be either true or false (got #{generate_indexing.inspect})"
       @default_generate_indexing = generate_indexing
     end
+
+    def db_migrate_command=(db_migrate_command)
+      db_migrate_command.is_a?(String) or raise ArgumentError, "db_migrate_command must be a string (got #{db_migrate_command.inspect})"
+      @db_migrate_command = db_migrate_command
+    end
   end
 end
 

data/lib/declare_schema/model.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rails'
-
 require 'declare_schema/extensions/module'
 
 module DeclareSchema
@@ -130,7 +128,7 @@ module DeclareSchema
 
         fk_options[:dependent] = options.delete(:far_end_dependent) if options.has_key?(:far_end_dependent)
 
-        if Rails::VERSION::MAJOR >= 5
+        if ActiveSupport::VERSION::MAJOR >= 5
           super
         else
           super(name, scope, options.except(:optional))
@@ -149,7 +147,7 @@ module DeclareSchema
         end
       end
 
-      if ::Rails::VERSION::MAJOR < 5
+      if ::ActiveSupport::VERSION::MAJOR < 5
         def primary_key
           super || 'id'
         end
@@ -227,7 +225,7 @@ module DeclareSchema
                   ActiveRecord::Coders::JSON
                 elsif [:load, :dump].all? { |x| class_name_or_coder.respond_to?(x) }
                   class_name_or_coder
-                elsif Rails::VERSION::MAJOR >= 5
+                elsif ActiveSupport::VERSION::MAJOR >= 5
                   ActiveRecord::Coders::YAMLColumn.new(attr_name, class_name_or_coder)
                 else
                   ActiveRecord::Coders::YAMLColumn.new(class_name_or_coder)

data/lib/declare_schema/model/column.rb

@@ -53,7 +53,7 @@ module DeclareSchema
         def deserialize_default_value(column, type, default_value)
           type or raise ArgumentError, "must pass type; got #{type.inspect}"
 
-          case Rails::VERSION::MAJOR
+          case ActiveSupport::VERSION::MAJOR
           when 4
             # TODO: Delete this Rails 4 support ASAP! This could be wrong, since it's using the type of the old column...which
             # might be getting migrated to a new type. We should be using just type as below. -Colin

data/lib/declare_schema/model/foreign_key_definition.rb

@@ -19,9 +19,8 @@ module DeclareSchema
         @parent_table_name = options[:parent_table]&.to_s
         @foreign_key_name = options[:foreign_key]&.to_s || @foreign_key
 
-        @constraint_name = options[:constraint_name]&.to_s ||
-                             options[:index_name]&.to_s ||
-                             IndexDefinition.index_name(@foreign_key_name)
+        @constraint_name = options[:constraint_name]&.to_s.presence ||
+                             model.connection.index_name(model.table_name, column: @foreign_key_name)
         @on_delete_cascade = options[:dependent] == :delete
       end
 

data/lib/declare_schema/model/index_definition.rb

@@ -68,7 +68,7 @@ module DeclareSchema
 
         # This is the old approach which is still needed for MySQL in Rails 4 and SQLite
         def sqlite_compound_primary_key(model, table)
-          ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/) || Rails::VERSION::MAJOR < 5 or return nil
+          ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/) || ActiveSupport::VERSION::MAJOR < 5 or return nil
 
           connection = model.connection.dup
 

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

data/lib/generators/declare_schema/migration/USAGE

@@ -1,47 +1,37 @@
 Description:
 
         This generator compares your existing schema against the
-        schema declared inside your fields declarations in your
-        models.
+        schema declared inside your declare_schema do ... end
+        declarations in your models.
 
         If the generator finds differences, it will display the
-        migration it has created, and ask you if you wish to
-        [g]enerate migration, generate and [m]igrate now or [c]ancel?
-        Enter "g" to just generate the migration but do not run it.
-        Enter "m" to generate the migration and run it, or press "c"
-        to do nothing.
-
-        The generator will then prompt you for the migration name,
+        migration it has created, and prompt you for the migration name,
         supplying a numbered default name.
 
         The generator is conservative and will prompt you to resolve
         any ambiguities.
 
-Examples:
+Example:
 
-        $ rails generate declare_schema:migration
+        $ bundle exec rails generate declare_schema:migration
 
         ---------- Up Migration ----------
-        create_table :foos do |t|
+        create_table :users do |t|
+          t.string :first_name, limit: 50
+          t.string :last_name, limit: 50
           t.datetime :created_at
           t.datetime :updated_at
         end
         ----------------------------------
 
         ---------- Down Migration --------
-        drop_table :foos
+        drop_table :users
         ----------------------------------
-        What now: [g]enerate migration, generate and [m]igrate now or [c]ancel? m
-
-        Migration filename:
-        (you can type spaces instead of '_' -- every little helps)
-        Filename [declare_schema_migration_2]: create_foo
+        Migration filename: (spaces will be converted to _) [declare_schema_migration_2]: create users
               exists  db/migrate
-              create  db/migrate/20091023183838_create_foo.rb
-        (in /work/foo)
-        ==  CreateFoo: migrating ======================================================
-        -- create_table(:yos)
-           -> 0.0856s
-        ==  CreateFoo: migrated (0.0858s) =============================================
+              create  db/migrate/20091023183838_create_users.rb
+
+Not running migration since --migrate not given. When you are ready, run:
 
+   bundle exec rails db:migrate
 

data/lib/generators/declare_schema/migration/migration_generator.rb

@@ -38,20 +38,18 @@ module DeclareSchema
                  type: :boolean,
                  desc: "Don't prompt for a migration name - just pick one"
 
-    class_option :generate,
-                 aliases: '-g',
-                 type: :boolean,
-                 desc: "Don't prompt for action - generate the migration"
-
     class_option :migrate,
                  aliases: '-m',
                  type: :boolean,
-                 desc: "Don't prompt for action - generate and migrate"
+                 desc: "After generating migration, run it"
 
     def migrate
       return if migrations_pending?
 
-      generator = Generators::DeclareSchema::Migration::Migrator.new(->(c, d, k, p) { extract_renames!(c, d, k, p) })
+      generator = Generators::DeclareSchema::Migration::Migrator.new do |to_create, to_drop, kind_str, name_prefix|
+        extract_renames!(to_create, to_drop, kind_str, name_prefix)
+      end
+
       up, down = generator.generate
 
       if up.blank?
@@ -67,34 +65,31 @@ module DeclareSchema
       say down
       say "----------------------------------"
 
-      action = options[:generate] && 'g' ||
-               options[:migrate] && 'm' ||
-               choose("\nWhat now: [g]enerate migration, generate and [m]igrate now or [c]ancel?", /^(g|m|c)$/)
-
-      if action != 'c'
-        if name.blank? && !options[:default_name]
-          final_migration_name = choose("\nMigration filename: [<enter>=#{migration_name}|<custom_name>]:", /^[a-z0-9_ ]*$/, migration_name).strip.gsub(' ', '_')
-        end
-        final_migration_name = migration_name if final_migration_name.blank?
-
-        up.gsub!("\n", "\n    ")
-        up.gsub!(/ +\n/, "\n")
-        down.gsub!("\n", "\n    ")
-        down.gsub!(/ +\n/, "\n")
-
-        @up = up
-        @down = down
-        @migration_class_name = final_migration_name.camelize
-
-        migration_template('migration.rb.erb', "db/migrate/#{final_migration_name.underscore}.rb")
-        if action == 'm'
-          case Rails::VERSION::MAJOR
-          when 4
-            rake('db:migrate')
-          else
-            rails_command('db:migrate')
-          end
+      final_migration_name =
+        name.presence ||
+        if !options[:default_name]
+          choose("\nMigration filename (spaces will be converted to _) [#{default_migration_name}]:", /^[a-z0-9_ ]*$/,
+                 default_migration_name).strip.gsub(' ', '_').presence
+        end ||
+        default_migration_name
+
+      @up = indent(up, 4)
+      @down = indent(down, 4)
+      @migration_class_name = final_migration_name.camelize
+
+      migration_template('migration.rb.erb', "db/migrate/#{final_migration_name.underscore}.rb")
+
+      db_migrate_command = ::DeclareSchema.db_migrate_command
+      if options[:migrate]
+        say db_migrate_command
+        bare_rails_command = db_migrate_command.sub(/\Abundle exec +/, '').sub(/\Arake +|rails +/, '')
+        if ActiveSupport::VERSION::MAJOR < 5
+          rake(bare_rails_command)
+        else
+          rails_command(bare_rails_command)
         end
+      else
+        say "\nNot running migration since --migrate not given. When you are ready, run:\n\n   #{db_migrate_command}\n\n"
       end
     rescue ::DeclareSchema::UnknownTypeError => ex
       say "Invalid field type: #{ex}"
@@ -102,8 +97,15 @@ module DeclareSchema
 
     private
 
+    if ActiveSupport::VERSION::MAJOR < 5
+      def indent(string, columns)
+        whitespace = ' ' * columns
+        string.gsub("\n", "\n#{whitespace}").gsub!(/ +\n/, "\n")
+      end
+    end
+
     def migrations_pending?
-      migrations = case Rails::VERSION::MAJOR
+      migrations = case ActiveSupport::VERSION::MAJOR
                    when 4
                      ActiveRecord::Migrator.migrations('db/migrate')
                    when 5
@@ -111,7 +113,7 @@ module DeclareSchema
                    else
                      ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration).migrations
                    end
-      pending_migrations = case Rails::VERSION::MAJOR
+      pending_migrations = case ActiveSupport::VERSION::MAJOR
                            when 4, 5
                              ActiveRecord::Migrator.new(:up, migrations).pending_migrations
                            else
@@ -176,8 +178,8 @@ module DeclareSchema
       to_rename
     end
 
-    def migration_name
-      name || Generators::DeclareSchema::Migration::Migrator.default_migration_name
+    def default_migration_name
+      Generators::DeclareSchema::Migration::Migrator.default_migration_name
     end
   end
 end

data/lib/generators/declare_schema/migration/migrator.rb

@@ -47,8 +47,8 @@ module Generators
           deprecate :default_charset=, :default_collation=, :default_charset, :default_collation, deprecator: ActiveSupport::Deprecation.new('1.0', 'declare_schema')
         end
 
-        def initialize(ambiguity_resolver = {}, renames: nil)
-          @ambiguity_resolver = ambiguity_resolver
+        def initialize(renames: nil, &block)
+          @ambiguity_resolver = block
           @drops = []
           @renames = renames
         end
@@ -483,7 +483,7 @@ module Generators
             parent_columns = connection.columns(parent_table) rescue []
             pk_limit =
               if (pk_column = parent_columns.find { |column| column.name.to_s == "id" }) # right now foreign keys assume id is the target
-                if Rails::VERSION::MAJOR < 5
+                if ActiveSupport::VERSION::MAJOR < 5
                   pk_column.cast_type.limit
                 else
                   pk_column.limit
@@ -549,7 +549,7 @@ module Generators
           end
         end
 
-        SchemaDumper = case Rails::VERSION::MAJOR
+        SchemaDumper = case ActiveSupport::VERSION::MAJOR
                        when 4
                          ActiveRecord::SchemaDumper
                        else

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

@@ -1,4 +1,4 @@
-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 %>
   end

data/spec/lib/declare_schema/api_spec.rb

@@ -39,7 +39,7 @@ 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
         generate_migrations '-n', '-m'
       end

data/spec/lib/declare_schema/field_spec_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe DeclareSchema::Model::FieldSpec do
   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
@@ -63,7 +62,7 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
         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
@@ -131,7 +130,7 @@ RSpec.describe 'DeclareSchema Migration Generator interactive primary key' do
         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

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -1,11 +1,15 @@
 # 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__)
@@ -26,20 +30,20 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     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
@@ -87,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)
@@ -366,10 +370,10 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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" if defined?(Mysql2)}
+          #{"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: :on_category_id" if defined?(Mysql2)}
+          #{"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
         EOS
@@ -390,8 +394,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -409,8 +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
       )
 
@@ -429,8 +433,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -454,12 +458,12 @@ 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_foreign_key :adverts, name: :on_c_id\n" +
-            "remove_foreign_key :adverts, name: :on_category_id" if defined?(Mysql2)}
+          #{"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_column :adverts, :updated_at
           remove_column :adverts, :created_at
@@ -484,8 +488,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -503,8 +507,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
           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)}
+          #{"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
       )
 
@@ -522,8 +526,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -539,8 +543,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -556,8 +560,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
           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)}
+          #{"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
       )
 
@@ -573,8 +577,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -606,14 +610,14 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           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?(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"
+              "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)
           #{if defined?(Mysql2)
-              "remove_foreign_key :adverts, name: :on_c_id\n" +
-              "remove_foreign_key :adverts, name: :on_category_id"
+              "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
@@ -836,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
@@ -1020,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
@@ -1127,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
@@ -1145,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
 
@@ -1198,7 +1250,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)
@@ -1477,10 +1529,10 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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: :on_category_id" if defined?(Mysql2)}
+          #{"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
         EOS
@@ -1501,8 +1553,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -1520,8 +1572,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
       )
 
@@ -1540,8 +1592,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -1565,12 +1617,12 @@ 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_foreign_key :adverts, name: :on_c_id\n" +
-            "remove_foreign_key :adverts, name: :on_category_id" if defined?(Mysql2)}
+          #{"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_column :adverts, :updated_at
           remove_column :adverts, :created_at
@@ -1595,8 +1647,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -1614,8 +1666,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
           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)}
+          #{"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
       )
 
@@ -1633,8 +1685,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -1650,8 +1702,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -1667,8 +1719,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
           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)}
+          #{"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
       )
 
@@ -1684,8 +1736,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         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_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
       )
 
@@ -1716,14 +1768,14 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           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?(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"
+              "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)
             #{if defined?(Mysql2)
-                "remove_foreign_key :adverts, name: :on_c_id\n" +
-                "remove_foreign_key :adverts, name: :on_category_id"
+                "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
@@ -1946,6 +1998,55 @@ 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
+        )
+        binding.pry
+        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
@@ -2130,8 +2231,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
@@ -2237,13 +2338,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
@@ -2255,7 +2356,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
 

data/spec/lib/declare_schema/model/column_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rails'
-
 begin
   require 'mysql2'
 rescue LoadError
@@ -16,7 +14,7 @@ RSpec.describe DeclareSchema::Model::Column do
 
   describe 'class methods' do
     describe '.native_type?' do
-      if Rails::VERSION::MAJOR >= 5
+      if ActiveSupport::VERSION::MAJOR >= 5
         let(:native_types) { [:string, :text, :integer, :float, :decimal, :datetime, :time, :date, :binary, :boolean, :json] }
       else
         let(:native_types) { [:string, :text, :integer, :float, :decimal, :datetime, :time, :date, :binary, :boolean] }
@@ -65,9 +63,7 @@ RSpec.describe DeclareSchema::Model::Column do
     end
 
     describe '.deserialize_default_value' do
-      require 'rails'
-
-      if ::Rails::VERSION::MAJOR >= 5
+      if ::ActiveSupport::VERSION::MAJOR >= 5
         it 'deserializes :boolean' do
           expect(described_class.deserialize_default_value(nil, :boolean, 'true')).to eq(true)
           expect(described_class.deserialize_default_value(nil, :boolean, 'false')).to eq(false)

data/spec/lib/declare_schema/model/foreign_key_definition_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
       subject { described_class.new(model, foreign_key, options)}
 
       before do
-        allow(connection).to receive(:index_name).with('models', column: 'network_id') { 'on_network_id' }
+        allow(model.connection).to receive(:index_name).with(any_args) { 'index_on_network_id' }
       end
 
       describe '#initialize' do
@@ -36,7 +36,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
         end
 
         context 'when most options passed' do
-          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, index_name: :index_on_network_id } }
+          let(:options) { { parent_table: :networks, foreign_key: :the_network_id } }
 
           it 'normalizes symbols to strings' do
             expect(subject.foreign_key).to eq('network_id')
@@ -50,8 +50,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
 
         context 'when all options passed' do
           let(:foreign_key) { nil }
-          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, index_name: :index_on_network_id,
-                            constraint_name: :constraint_1, dependent: :delete } }
+          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, constraint_name: :constraint_1, dependent: :delete } }
 
           it 'normalizes symbols to strings' do
             expect(subject.foreign_key).to be_nil
@@ -61,6 +60,19 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
             expect(subject.on_delete_cascade).to be_truthy
           end
         end
+
+        context 'when constraint name passed as empty string' do
+          let(:options) { { constraint_name: "" } }
+          it 'defaults to rails constraint name' do
+            expect(subject.constraint_name).to eq("index_on_network_id")
+          end
+        end
+
+        context 'when no constraint name passed' do
+          it 'defaults to rails constraint name' do
+            expect(subject.constraint_name).to eq("index_on_network_id")
+          end
+        end
       end
     end
 
@@ -107,7 +119,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
       subject { described_class.new(model, foreign_key, options)}
 
       before do
-        allow(connection).to receive(:index_name).with('models', column: 'network_id') { 'on_network_id' }
+        allow(model.connection).to receive(:index_name).with(any_args) { 'index_on_network_id' }
       end
 
       describe '#initialize' do
@@ -117,7 +129,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
         end
 
         context 'when most options passed' do
-          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, index_name: :index_on_network_id } }
+          let(:options) { { parent_table: :networks, foreign_key: :the_network_id } }
 
           it 'normalizes symbols to strings' do
             expect(subject.foreign_key).to eq('network_id')
@@ -131,8 +143,7 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
 
         context 'when all options passed' do
           let(:foreign_key) { nil }
-          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, index_name: :index_on_network_id,
-                            constraint_name: :constraint_1, dependent: :delete } }
+          let(:options) { { parent_table: :networks, foreign_key: :the_network_id, constraint_name: :constraint_1, dependent: :delete } }
 
           it 'normalizes symbols to strings' do
             expect(subject.foreign_key).to be_nil
@@ -142,6 +153,19 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
             expect(subject.on_delete_cascade).to be_truthy
           end
         end
+
+        context 'when constraint name passed as empty string' do
+          let(:options) { { constraint_name: "" } }
+          it 'defaults to rails constraint name' do
+            expect(subject.constraint_name).to eq("index_on_network_id")
+          end
+        end
+
+        context 'when no constraint name passed' do
+          it 'defaults to rails constraint name' do
+            expect(subject.constraint_name).to eq("index_on_network_id")
+          end
+        end
       end
     end
 

data/spec/lib/declare_schema/model/habtm_model_shim_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rails'
-
 begin
   require 'mysql2'
 rescue LoadError

data/spec/lib/declare_schema/model/index_definition_spec.rb

@@ -75,7 +75,7 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
           ActiveRecord::Base.connection.execute <<~EOS
               CREATE TABLE index_definition_test_models (
                 id INTEGER NOT NULL PRIMARY KEY,
-                name #{if defined?(Sqlite3) then 'TEXT' else 'VARCHAR(255)' end} NOT NULL
+                name #{if defined?(SQLite3) then 'TEXT' else 'VARCHAR(255)' end} NOT NULL
               )
           EOS
           ActiveRecord::Base.connection.execute <<~EOS
@@ -110,7 +110,7 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
             let(:model_class) { IndexDefinitionCompoundIndexModel }
 
             it 'returns the indexes for the model' do
-              if Rails::VERSION::MAJOR < 5
+              if ActiveSupport::VERSION::MAJOR < 5
                 expect(model_class.connection).to receive(:primary_key).with('index_definition_compound_index_models').and_return(nil)
                 connection_stub = instance_double(ActiveRecord::Base.connection.class, "connection")
                 expect(connection_stub).to receive(:indexes).
@@ -184,7 +184,7 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
           ActiveRecord::Base.connection.execute <<~EOS
             CREATE TABLE index_definition_test_models (
               id INTEGER NOT NULL PRIMARY KEY,
-              name #{if defined?(Sqlite3) then 'TEXT' else 'VARCHAR(255)' end} NOT NULL
+              name #{if defined?(SQLite3) then 'TEXT' else 'VARCHAR(255)' end} NOT NULL
             )
           EOS
           ActiveRecord::Base.connection.execute <<~EOS
@@ -219,7 +219,7 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
             let(:model_class) { IndexDefinitionCompoundIndexModel }
 
             it 'returns the indexes for the model' do
-              if Rails::VERSION::MAJOR < 5
+              if ActiveSupport::VERSION::MAJOR < 5
                 expect(model_class.connection).to receive(:primary_key).with('index_definition_compound_index_models').and_return(nil)
                 connection_stub = instance_double(ActiveRecord::Base.connection.class, "connection")
                 expect(connection_stub).to receive(:indexes).

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ RSpec.configure do |config|
   RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 2_000
 
   def active_record_base_class
-    if Rails::VERSION::MAJOR == 4
+    if ActiveSupport::VERSION::MAJOR == 4
       'ActiveRecord::Base'
     else
       'ApplicationRecord'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,7 +128,7 @@ homepage: https://github.com/Invoca/declare_schema
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Database schema declaration and migration generator for Rails
 test_files: []