declare_schema 1.5.0.pre.1 → 2.1.0.pre.1

data/README.md

@@ -2,6 +2,26 @@
 
 Declare your Rails/ActiveRecord model schemas and have database migrations generated for you!
 
+The `DeclareSchema` gem provides a DSL for declaring your model schemas in a block, and then generates the corresponding database migration for you. It also provides a way to configure the default schema for all models, and to ignore certain tables.
+
+Currently tested against:
+- Ruby 3.0+
+- Rails 6.1+
+- MySQL 5.7
+- SQLite
+- PostgreSQL 16
+
+## Installation
+
+Install the `DeclareSchema` gem directly:
+```
+  $ gem install declare_schema
+```
+or add it to your `bundler` Gemfile:
+```
+  gem 'declare_schema'
+```
+
 ## Example
 
 Make a model and declare your schema within a `declare_schema do ... end` block:
@@ -115,6 +135,8 @@ The following `index` options are supported:
 - `length` (integer or hash) - The partial index length(s). If an integer is provided, it is used as the length for all columns. If a hash is provided, it is used to specify the length for individual columns, where the column names are given as `Symbol` hash keys.
 - `where` (string) - The subset index predicate.
 
+**Note:** The `DeclareSchema.max_index_and_constraint_name_length` setting is ignored when using `PostgreSQL` since that database does not have a limit on the length of index names, and requires globally unique index names.
+
 ## Usage without Rails
 
 When using `DeclareSchema` without Rails, you can use the `declare_schema/rake` task to generate the migration file.
@@ -314,6 +336,9 @@ DeclareSchema.max_index_and_constraint_name_length = 64
 If you know that your migrations will only be used on a database type with a different limit, you can
 adjust this configuration value. A `nil` value means "unlimited".
 
+**Note:** This setting is ignored when using `PostgreSQL` since that database does not have a limit on the length of index names,
+and requires globally unique index names.
+
 ## Declaring Character Set and Collation
 _Note: This feature currently only works for MySQL database configurations._
 
@@ -367,19 +392,18 @@ class Comment < ActiveRecord::Base
 end
 ```
 
-## Installing
+## Contributions
 
-Install the `DeclareSchema` gem directly:
-```
-  $ gem install declare_schema
-```
-or add it to your `bundler` Gemfile:
-```
-  gem 'declare_schema'
-```
-## Testing
-To run tests:
-```
-rake test:prepare_testapp[force]
-rake test:all
+Contributions to this project are always welcome. Please thoroughly read our [Contribution Guidelines](CONTRIBUTING.md) before starting any work.
+
+### Local Development
+
+Depending on the database you are developing for, you may need to install the appropriate database client and server in order to appropriately test your changes. To help with this, we've provided a [DevContainer](https://github.com/devcontainers) configuration that will set up a development environment for you. To use this, you will need to have Docker installed on your machine.
+
+### Running Tests Locally
+To run tests locally, you need to prepare a test application using the specific adapter you'd like to test against. For example, to test against MySQL:
+
+```bash
+bundle exec rake test:prepare_testapp[mysql,true]
+bundle exec rake test:all
 ```

data/Rakefile

@@ -26,24 +26,14 @@ namespace "test" do
   task all: :spec
 
   desc "Prepare a rails application for testing"
-  task :prepare_testapp, :force do |_t, args|
+  task :prepare_testapp, [:adapter, :force] do |_t, args|
     if args.force || !File.directory?(TESTAPP_PATH)
       FileUtils.remove_entry_secure(TESTAPP_PATH, true)
-      sh %(#{BIN} new #{TESTAPP_PATH} --skip-wizard --skip-bundle --api)
+      sh %(#{BIN} new #{TESTAPP_PATH} --skip-wizard --skip-bundle --api -d #{args.adapter})
       FileUtils.chdir(TESTAPP_PATH)
-      begin
-        require 'mysql2'
-        if ENV['MYSQL_PORT']
-          sh "(echo 'H';
-               echo '1,$s/localhost/127.0.0.1/';
-               echo '/host:/';
-               echo 'a';
-               echo '  port: #{ENV['MYSQL_PORT']}';
-               echo '.';
-               echo w;
-               echo q) | ed #{TESTAPP_PATH}/config/database.yml || echo ed failed!"
-        end
-      rescue LoadError
+      if args.adapter == 'mysql'
+        sh "sed -i -e 's/host:.*/host: <%= ENV[\"MYSQL_HOST\"].presence || \"localhost\" %>/g' #{TESTAPP_PATH}/config/database.yml || echo sed failed!"
+        sh "sed -i -e 's/password:.*/password: <%= ENV[\"MYSQL_PASSWORD\"].presence %>/g' #{TESTAPP_PATH}/config/database.yml || echo sed failed!"
       end
       sh "bundle install"
       sh "(echo '';

data/catalog-info.yaml

@@ -0,0 +1,35 @@
+# This file is partially auto-generated by the invoca-backstage-tools gem
+# The following fields should not be edited manually as they are auto-generated
+# based on the contents of the repo:
+#  - metadata.name
+#  - metadata.title
+#  - metadata.description
+#  - annotations.github.com/project-slug
+#  - invoca.com/version-repository-location
+#  - invoca.com/version-repository-name
+#  - spec.type
+#  - spec.owner
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: declare_schema-gem
+  title: DeclareSchema
+  annotations:
+    buildkite.com/project-slug: Invoca/declare_schema
+    github.com/project-slug: invoca/declare_schema
+    invoca.com/version-repository-location: rubygems
+    invoca.com/version-repository-name: declare_schema
+    endoflife.date/products: ruby@3.1
+  tags:
+  - ruby
+  - open-source
+  - gem
+  - executable
+  description: Declare your Rails/active_record model schemas and have database migrations
+    generated for you!
+spec:
+  type: library
+  lifecycle: production
+  owner: octothorpe
+  dependsOn: []

data/config/brakeman.ignore

@@ -26,11 +26,11 @@
     {
       "warning_type": "Command Injection",
       "warning_code": 14,
-      "fingerprint": "601f18b634f67229235d6e91434d1ea4c3c845876c4786d27380034e66178ee6",
+      "fingerprint": "6b90f8dd199afbdf79cc8c4d00a0853e0696b067d00c0fe93071e31b69de8628",
       "check_name": "Execute",
       "message": "Possible command injection",
       "file": "lib/declare_schema/command.rb",
-      "line": 51,
+      "line": 45,
       "link": "https://brakemanscanner.org/docs/warning_types/command_injection/",
       "code": "system(\"rails new #{\"new\"} #{(args * \" \")} -m #{File.join(Dir.tmpdir, \"declare_schema_app_template\")}#{begin\n  (require(\"mysql2\")\n  \" -d mysql\")\nrescue LoadError\n  # do nothing\nend}\")",
       "render_path": null,

data/declare_schema.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 5.0'
+  s.add_dependency 'rails', '>= 6.0'
 end

data/gemfiles/{rails_6_1_sqlite3.gemfile → rails_6_1.gemfile}

@@ -11,8 +11,11 @@ gem "pry-byebug"
 gem "rails", "~> 6.1.0"
 gem "responders"
 gem "rspec"
+gem "rspec-its"
 gem "rubocop"
 gem "yard"
+gem "mysql2", "~> 0.5"
+gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
 
 group :testapp do

data/gemfiles/{rails_7_0_sqlite3.gemfile → rails_7_0.gemfile}

@@ -11,8 +11,11 @@ gem "pry-byebug"
 gem "rails", "~> 7.0.0"
 gem "responders"
 gem "rspec"
+gem "rspec-its"
 gem "rubocop"
 gem "yard"
+gem "mysql2", "~> 0.5"
+gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
 
 group :testapp do

data/gemfiles/{rails_7_1_sqlite3.gemfile → rails_7_1.gemfile}

@@ -11,8 +11,11 @@ gem "pry-byebug"
 gem "rails", "~> 7.1.0"
 gem "responders"
 gem "rspec"
+gem "rspec-its"
 gem "rubocop"
 gem "yard"
+gem "mysql2", "~> 0.5"
+gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
 
 group :testapp do

data/gemfiles/{rails_7_0_mysql2.gemfile → rails_7_2.gemfile}

@@ -8,12 +8,15 @@ gem "mail"
 gem "net-smtp"
 gem "pry"
 gem "pry-byebug"
-gem "rails", "~> 7.0.0"
+gem "rails", "~> 7.2.0"
 gem "responders"
 gem "rspec"
+gem "rspec-its"
 gem "rubocop"
 gem "yard"
 gem "mysql2", "~> 0.5"
+gem "pg", "~> 1.1"
+gem "sqlite3", "~> 1.4"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/lib/declare_schema/command.rb

@@ -41,14 +41,8 @@ module DeclareSchema
             file.puts ["gem '#{gem}', '>= #{version}'", (gemfile_options.inspect unless gemfile_options.empty?)].compact.join(', ')
           end
           puts "Generating Rails infrastructure..."
-          database_option =
-            begin
-              require 'mysql2'
-              ' -d mysql'
-            rescue LoadError
-            end
-          puts("rails new #{app_name} #{args * ' '} -m #{template_path}#{database_option}")
-          system("rails new #{app_name} #{args * ' '} -m #{template_path}#{database_option}")
+          puts("rails new #{app_name} #{args * ' '} -m #{template_path}")
+          system("rails new #{app_name} #{args * ' '} -m #{template_path}")
           File.delete(template_path)
 
         when /^(g|generate|destroy)$/

data/lib/declare_schema/model/column.rb

@@ -52,7 +52,7 @@ module DeclareSchema
 
         def deserialize_default_value(column, type, default_value)
           type or raise ArgumentError, "must pass type; got #{type.inspect}"
-          cast_type = ActiveRecord::Base.connection.send(:lookup_cast_type, type.to_s) or
+          cast_type = ActiveRecord::Base.connection.lookup_cast_type_from_column(column) or
             raise "cast_type not found for #{type}"
           cast_type.deserialize(default_value)
         end

data/lib/declare_schema/model/foreign_key_definition.rb

@@ -31,19 +31,16 @@ module DeclareSchema
       end
 
       class << self
+        # TODO: I think we might just be able to start using the AR built in moving forward
         def for_table(child_table_name, connection, dependent: nil)
-          show_create_table = connection.select_rows("show create table #{connection.quote_table_name(child_table_name)}").first.last
-          constraints = show_create_table.split("\n").map { |line| line.strip if line['CONSTRAINT'] }.compact
-
-          constraints.map do |fkc|
-            constraint_name, foreign_key_column, parent_table_name = fkc.match(/CONSTRAINT `([^`]*)` FOREIGN KEY \(`([^`]*)`\) REFERENCES `([^`]*)`/).captures
-            dependent_value = :delete if dependent || fkc['ON DELETE CASCADE']
-
-            new(foreign_key_column,
-                constraint_name: constraint_name,
-                child_table_name: child_table_name,
-                parent_table_name: parent_table_name,
-                dependent: dependent_value)
+          connection.foreign_keys(child_table_name).map do |fkc|
+            new(
+              fkc.column,
+              constraint_name: fkc.name,
+              child_table_name: fkc.from_table,
+              parent_table_name: fkc.to_table,
+              dependent: dependent || fkc.on_delete == :cascade ? :delete : nil
+            )
           end
         end
       end

data/lib/declare_schema/model/index_definition.rb

@@ -64,14 +64,11 @@ module DeclareSchema
         end
 
         def default_index_name(table_name, columns)
-          index_name = nil
-          [:long_index_name, :short_index_name].find do |method_name|
-            index_name = send(method_name, table_name, columns)
-            if DeclareSchema.max_index_and_constraint_name_length.nil? || index_name.length <= DeclareSchema.max_index_and_constraint_name_length
-              break index_name
-            end
-          end or raise IndexNameTooLongError,
-                       "Default index name '#{index_name}' exceeds configured limit of #{DeclareSchema.max_index_and_constraint_name_length} characters. Use the `name:` option to give it a shorter name, or adjust DeclareSchema.max_index_and_constraint_name_length if you know your database can accept longer names."
+          if DeclareSchema.current_adapter == 'postgresql'
+            long_index_name(table_name, columns)
+          else
+            longest_valid_index_name(table_name, columns)
+          end
         end
 
         # This method normalizes the length option to be either nil or a Hash of Symbol column names to lengths,
@@ -108,6 +105,17 @@ module DeclareSchema
           end
         end
 
+        def longest_valid_index_name(table_name, columns)
+          index_name = nil
+          [:long_index_name, :short_index_name].find do |method_name|
+            index_name = send(method_name, table_name, columns)
+            if DeclareSchema.max_index_and_constraint_name_length.nil? || index_name.length <= DeclareSchema.max_index_and_constraint_name_length
+              break index_name
+            end
+          end or raise IndexNameTooLongError,
+                       "Default index name '#{index_name}' exceeds configured limit of #{DeclareSchema.max_index_and_constraint_name_length} characters. Use the `name:` option to give it a shorter name, or adjust DeclareSchema.max_index_and_constraint_name_length if you know your database can accept longer names." # rubocop:disable Layout/LineLength
+        end
+
         def long_index_name(table_name, columns)
           "index_#{table_name}_on_#{Array(columns).join("_and_")}"
         end

data/lib/declare_schema/model.rb

@@ -157,7 +157,7 @@ module DeclareSchema
         column_options[:default] = options.delete(:default) if options.has_key?(:default)
         if options.has_key?(:limit)
           options.delete(:limit)
-          ActiveSupport::Deprecation.warn("belongs_to #{name.inspect}, limit: is deprecated since it is now inferred")
+          DeclareSchema.deprecator.warn("belongs_to #{name.inspect}, limit: is deprecated since it is now inferred")
         end
 
         # index: true means create an index on the foreign key
@@ -171,7 +171,7 @@ module DeclareSchema
           index_options = {} # create an index
           case index_value
           when String, Symbol
-            ActiveSupport::Deprecation.warn("[declare_schema] belongs_to #{name.inspect}, index: 'name' is deprecated; use index: { name: 'name' } instead (in #{self.name})")
+            DeclareSchema.deprecator.warn("[declare_schema] belongs_to #{name.inspect}, index: 'name' is deprecated; use index: { name: 'name' } instead (in #{self.name})")
             index_options[:name] = index_value.to_s
           when true
           when nil
@@ -182,7 +182,7 @@ module DeclareSchema
           end
 
           if options.has_key?(:unique)
-            ActiveSupport::Deprecation.warn("[declare_schema] belongs_to #{name.inspect}, unique: true|false is deprecated; use index: { unique: true|false } instead (in #{self.name})")
+            DeclareSchema.deprecator.warn("[declare_schema] belongs_to #{name.inspect}, unique: true|false is deprecated; use index: { unique: true|false } instead (in #{self.name})")
             index_options[:unique] = options.delete(:unique)
           end
 
@@ -358,24 +358,20 @@ module DeclareSchema
       end
 
       def _add_formatting_for_field(name, type)
-        if (type_class = DeclareSchema.to_class(type))
-          if "format".in?(type_class.instance_methods)
-            before_validation do |record|
-              record.send("#{name}=", record.send(name)&.format)
-            end
+        if (type_class = DeclareSchema.to_class(type)) && "format".in?(type_class.instance_methods)
+          before_validation do |record|
+            record.send("#{name}=", record.send(name)&.format)
           end
         end
       end
 
       def _add_index_for_field(column_name, args, **options)
-        if (index_name = options.delete(:index))
-          index_opts =
-            {
-              unique: args.include?(:unique) || !!options.delete(:unique)
-            }
+        if (index_config = options.delete(:index))
+          index_opts = index_config.is_a?(Hash) ? index_config : {}
+          index_opts[:unique] ||= args.include?(:unique) || !!options.delete(:unique)
 
           # support index: true declaration
-          index_opts[:name] = index_name unless index_name == true
+          index_opts[:name] = index_config unless index_config == true || index_config.is_a?(Hash)
           index([column_name], **index_opts)
         end
       end

data/lib/declare_schema/schema_change/base.rb

@@ -33,6 +33,10 @@ module DeclareSchema
 
       private
 
+      def current_adapter(model_class = ActiveRecord::Base)
+        DeclareSchema.current_adapter(model_class)
+      end
+
       def spacing(command)
         if command["\n"]
           "\n\n"

data/lib/declare_schema/schema_change/primary_key_change.rb

@@ -5,7 +5,7 @@ require_relative 'base'
 module DeclareSchema
   module SchemaChange
     class PrimaryKeyChange < Base
-      def initialize(table_name, old_column_names, new_column_names)
+      def initialize(table_name, old_column_names, new_column_names) # rubocop:disable Lint/MissingSuper
         @table_name = table_name
         @old_column_names = old_column_names.presence
         @new_column_names = new_column_names.presence
@@ -22,11 +22,24 @@ module DeclareSchema
       private
 
       def alter_primary_key(old_col_names, new_col_names)
-        drop_command = "DROP PRIMARY KEY" if old_col_names
-        add_command = "ADD PRIMARY KEY (#{new_col_names.join(', ')})" if new_col_names
-        commands = [drop_command, add_command].compact.join(', ')
-        statement = "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(@table_name)} #{commands}"
-        "execute #{statement.inspect}"
+        if current_adapter == 'postgresql'
+          [].tap do |commands|
+            if old_col_names
+              drop_command = "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(@table_name)} DROP CONSTRAINT #{@table_name}_pkey;"
+              commands << "execute #{drop_command.inspect}"
+            end
+            if new_col_names
+              add_command = "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(@table_name)} ADD PRIMARY KEY (#{new_col_names.join(', ')});"
+              commands << "execute #{add_command.inspect}"
+            end
+          end.join("\n")
+        else
+          drop_command = "DROP PRIMARY KEY" if old_col_names
+          add_command = "ADD PRIMARY KEY (#{new_col_names.join(', ')})" if new_col_names
+          commands = [drop_command, add_command].compact.join(', ')
+          statement = "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(@table_name)} #{commands}"
+          "execute #{statement.inspect}"
+        end
       end
     end
   end

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "1.5.0.pre.1"
+  VERSION = "2.1.0.pre.1"
 end

data/lib/declare_schema.rb

@@ -24,14 +24,14 @@ module DeclareSchema
 
   SEMVER_8 = Gem::Version.new('8.0.0').freeze
 
-  @default_charset               = "utf8mb4"
-  @default_collation             = "utf8mb4_bin"
-  @default_text_limit            = 0xffff_ffff
-  @default_string_limit          = nil
-  @default_null                  = false
-  @default_generate_foreign_keys = true
-  @default_generate_indexing     = true
-  @db_migrate_command            = "bundle exec rails db:migrate"
+  @default_charset                      = "utf8mb4"
+  @default_collation                    = "utf8mb4_bin"
+  @default_text_limit                   = 0xffff_ffff
+  @default_string_limit                 = nil
+  @default_null                         = false
+  @default_generate_foreign_keys        = true
+  @default_generate_indexing            = true
+  @db_migrate_command                   = "bundle exec rails db:migrate"
   @max_index_and_constraint_name_length = 64  # limit for MySQL
 
   class << self
@@ -146,6 +146,18 @@ module DeclareSchema
       length.is_a?(Integer) || length.nil? or raise ArgumentError, "max_index_and_constraint_name_length must be an Integer or nil (meaning unlimited)"
       @max_index_and_constraint_name_length = length
     end
+
+    def deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new('3.0', 'DeclareSchema')
+    end
+
+    def current_adapter(model_class = ActiveRecord::Base)
+      if Rails::VERSION::MAJOR >= 7
+        model_class.connection_db_config.adapter
+      else
+        model_class.connection_config[:adapter]
+      end
+    end
   end
 end
 

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

@@ -107,32 +107,41 @@ module DeclareSchema
     end
 
     def load_migrations
-      if ActiveSupport.version >= Gem::Version.new('7.1.0')
+      if ActiveSupport.version >= Gem::Version.new('7.2.0')
+        ActiveRecord::MigrationContext.new(
+          ActiveRecord::Migrator.migrations_paths,
+          ActiveRecord::SchemaMigration.new(ActiveRecord::Base.connection_pool),
+          ActiveRecord::InternalMetadata.new(ActiveRecord::Base.connection_pool)
+        ).migrations
+      elsif ActiveSupport.version >= Gem::Version.new('7.1.0')
         ActiveRecord::MigrationContext.new(
           ActiveRecord::Migrator.migrations_paths,
           ActiveRecord::Base.connection.schema_migration,
           ActiveRecord::Base.connection.internal_metadata
         ).migrations
-      elsif ActiveSupport.version >= Gem::Version.new('6.0.0')
+      else
         ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration).migrations
-      else # Rails 5.2 and earlier
-        ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrations
       end
     end
 
     def load_pending_migrations
       migrations = load_migrations
-      if ActiveSupport.version >= Gem::Version.new('7.1.0')
+      if ActiveSupport.version >= Gem::Version.new('7.2.0')
+        ActiveRecord::Migrator.new(
+          :up,
+          migrations,
+          ActiveRecord::SchemaMigration.new(ActiveRecord::Base.connection_pool),
+          ActiveRecord::InternalMetadata.new(ActiveRecord::Base.connection_pool)
+        ).pending_migrations
+      elsif ActiveSupport.version >= Gem::Version.new('7.1.0')
         ActiveRecord::Migrator.new(
           :up,
           migrations,
           ActiveRecord::Base.connection.schema_migration,
           ActiveRecord::Base.connection.internal_metadata
         ).pending_migrations
-      elsif ActiveSupport.version >= Gem::Version.new('6.0.0')
+      else
         ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration).pending_migrations
-      else # Rails 5.2 and earlier
-        ActiveRecord::Migrator.new(:up, migrations).pending_migrations
       end
     end
 

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

@@ -303,7 +303,7 @@ module Generators
         private
 
         def up_and_down_migrations(migration_commands)
-          up   = migration_commands.map(&:up  ).select(&:present?)
+          up   = migration_commands.map(&:up).select(&:present?)
           down = migration_commands.map(&:down).select(&:present?).reverse
 
           [up * "\n", down * "\n"]
@@ -314,7 +314,7 @@ module Generators
           if primary_key.blank? || disable_auto_increment
             { id: false }
           elsif primary_key == "id"
-            { id: :bigint }
+            { id: current_adapter == 'postgresql' ? :bigserial : :bigint }
           elsif primary_key.is_a?(Array)
             { primary_key: primary_key.map(&:to_sym) }
           else
@@ -322,14 +322,18 @@ module Generators
           end.merge(model._table_options)
         end
 
+        def current_adapter(model_class = ActiveRecord::Base)
+          ::DeclareSchema.current_adapter(model_class)
+        end
+
         def table_options_for_model(model)
-          if ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
-            {}
-          else
+          if current_adapter == 'mysql2'
             {
               charset:   model._table_options&.[](:charset) || ::DeclareSchema.default_charset,
               collation: model._table_options&.[](:collation) || ::DeclareSchema.default_collation
             }
+          else
+            {}
           end
         end
 
@@ -601,12 +605,15 @@ module Generators
           end
         end
 
-        SchemaDumper = ActiveRecord::ConnectionAdapters::SchemaDumper
-
-
         def add_table_back(table)
           dumped_schema_stream = StringIO.new
-          SchemaDumper.send(:new, ActiveRecord::Base.connection).send(:table, table, dumped_schema_stream)
+          dumper = case current_adapter
+                   when 'postgresql'
+                     ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.create(ActiveRecord::Base.connection, {})
+                   else
+                     ActiveRecord::ConnectionAdapters::SchemaDumper.create(ActiveRecord::Base.connection, {})
+                   end
+          dumper.send(:table, table, dumped_schema_stream)
 
           dumped_schema = dumped_schema_stream.string.strip.gsub!("\n  ", "\n")
           if connection.class.name.match?(/mysql/i)

data/spec/fixtures/migrations/mysql2/will_generate_unique_constraint_names_rails_6.txt

@@ -0,0 +1,15 @@
+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: :index_advertisers_on_category_id
+add_index :affiliates, [:category_id], name: :index_affiliates_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

data/spec/fixtures/migrations/mysql2/will_generate_unique_constraint_names_rails_7.txt

@@ -0,0 +1,15 @@
+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
+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 :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
+add_index :affiliates, [:category_id], name: :index_affiliates_on_category_id
+add_index :advertisers, [:category_id], name: :index_advertisers_on_category_id
+add_foreign_key :affiliates, :categories, column: :category_id, name: :index_affiliates_on_category_id
+add_foreign_key :advertisers, :categories, column: :category_id, name: :index_advertisers_on_category_id

data/spec/fixtures/migrations/postgresql/will_generate_unique_constraint_names_rails_6.txt

@@ -0,0 +1,15 @@
+create_table :categories, id: :bigserial do |t|
+  t.string :name, limit: 250, null: true
+end
+create_table :advertisers, id: :bigserial do |t|
+  t.string  :name, limit: 250, null: true
+  t.integer :category_id, limit: 8, null: false
+end
+create_table :affiliates, id: :bigserial do |t|
+  t.string  :name, limit: 250, null: true
+  t.integer :category_id, limit: 8, null: false
+end
+add_index :advertisers, [:category_id], name: :index_advertisers_on_category_id
+add_index :affiliates, [:category_id], name: :index_affiliates_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