declare_schema 1.3.6 → 1.4.0.colin.1

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -108,8 +108,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           add_column :adverts, :published_at, :datetime, null: true
         EOS
         .and migrate_down(<<~EOS.strip)
-          remove_column :adverts, :published_at
-          remove_column :adverts, :body
+            remove_column :adverts, :published_at
+            remove_column :adverts, :body
         EOS
       )
 
@@ -141,8 +141,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           remove_column :adverts, :name
         EOS
         .and migrate_down(<<~EOS.strip)
-          add_column :adverts, :name, :string, limit: 250, null: true#{charset_and_collation}
-          remove_column :adverts, :title
+            add_column :adverts, :name, :string, limit: 250, null: true#{charset_and_collation}
+            remove_column :adverts, :title
         EOS
       )
 
@@ -179,7 +179,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           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, null: true#{charset_and_collation}
+              change_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
       EOS
       )
 
@@ -209,7 +209,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           change_column :adverts, :price, :integer, limit: 3, null: true
           EOS
               .and migrate_down(<<~EOS.strip)
-          change_column :adverts, :price, :integer, limit: 2, null: true
+              change_column :adverts, :price, :integer, limit: 2, null: true
       EOS
       )
 
@@ -306,7 +306,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)}, null: true#{charset_and_collation}
+                change_column :adverts, :description, :text#{', limit: 255' if defined?(Mysql2)}, null: true#{charset_and_collation}
         EOS
         )
 
@@ -323,7 +323,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)}, null: true#{charset_and_collation}
+                change_column :adverts, :description, :text#{', limit: 255' if defined?(Mysql2)}, null: true#{charset_and_collation}
         EOS
         )
       end
@@ -363,14 +363,14 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" if defined?(Mysql2)}
         EOS
         .and migrate_down(<<~EOS.strip)
-          #{"remove_foreign_key :adverts, name: :index_adverts_on_category_id" if defined?(Mysql2)}
-          remove_index :adverts, name: :index_adverts_on_category_id
-          remove_column :adverts, :category_id
+            #{"remove_foreign_key :adverts, name: :index_adverts_on_category_id" if defined?(Mysql2)}
+            remove_index :adverts, name: :index_adverts_on_category_id
+            remove_column :adverts, :category_id
         EOS
       )
 
       Advert.field_specs.delete(:category_id)
-      Advert.index_definitions.delete_if { |spec| spec.fields==["category_id"] }
+      Advert.index_definitions.delete_if { |spec| spec.fields == ["category_id"] }
 
       # If you specify a custom foreign key, the migration generator observes that:
 
@@ -411,7 +411,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       Advert.field_specs.delete(:category_id)
       Advert.index_definitions.delete_if { |spec| spec.fields == ["category_id"] }
 
-      # You can specify the index name with :index
+      # You can specify the index name with index: 'name' [deprecated]
+
+      expect(Kernel).to receive(:warn).with(/belongs_to index: 'name' is deprecated; use index: \{ name: 'name' \} instead/i)
 
       class Category < ActiveRecord::Base; end
       class Advert < ActiveRecord::Base
@@ -431,6 +433,26 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       Advert.field_specs.delete(:category_id)
       Advert.index_definitions.delete_if { |spec| spec.fields == ["category_id"] }
 
+      # You can specify the index name with index: { name: }'name', unique: true|false }
+
+      class Category < ActiveRecord::Base; end
+      class Advert < ActiveRecord::Base
+        declare_schema { }
+        belongs_to :category, index: { name: 'my_index', unique: false }
+      end
+
+      expect(Generators::DeclareSchema::Migration::Migrator.run).to(
+        migrate_up(<<~EOS.strip)
+            add_column :adverts, :category_id, :integer, limit: 8, null: false
+            add_index :adverts, [:category_id], name: :my_index
+            #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
+          "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
+      EOS
+      )
+
+      Advert.field_specs.delete(:category_id)
+      Advert.index_definitions.delete_if { |spec| spec.fields == ["category_id"] }
+
       ### Timestamps and Optimimistic Locking
 
       # `updated_at` and `created_at` can be declared with the shorthand `timestamps`.
@@ -452,11 +474,11 @@ RSpec.describe 'DeclareSchema Migration Generator' do
             "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
         .and migrate_down(<<~EOS.strip)
-          #{"remove_foreign_key :adverts, name: :index_adverts_on_c_id\n" +
-            "remove_foreign_key :adverts, name: :index_adverts_on_category_id" if defined?(Mysql2)}
-          remove_column :adverts, :lock_version
-          remove_column :adverts, :updated_at
-          remove_column :adverts, :created_at
+            #{"remove_foreign_key :adverts, name: :index_adverts_on_c_id\n" +
+              "remove_foreign_key :adverts, name: :index_adverts_on_category_id" if defined?(Mysql2)}
+            remove_column :adverts, :lock_version
+            remove_column :adverts, :updated_at
+            remove_column :adverts, :created_at
         EOS
       )
 
@@ -468,22 +490,29 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
       # You can add an index to a field definition
 
+      expect(Kernel).to receive(:warn).with(/belongs_to index: 'name' is deprecated; use index: \{ name: 'name' \} instead/i)
+      expect(Kernel).to receive(:warn).with(/belongs_to unique: true\|false is deprecated; use index: \{ unique: true\|false \} instead/i)
+
       class Advert < ActiveRecord::Base
         declare_schema do
           string :title, index: true, limit: 250, null: true
         end
+        belongs_to :category, index: 'my_index', unique: false
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
+          add_column :adverts, :category_id, :integer, limit: 8, null: false
           add_index :adverts, [:title], name: :index_adverts_on_title
+          add_index :adverts, [:category_id], name: :my_index
           #{"add_foreign_key :adverts, :categories, column: :category_id, name: :index_adverts_on_category_id\n" +
             "add_foreign_key :adverts, :categories, column: :c_id, name: :index_adverts_on_c_id" if defined?(Mysql2)}
         EOS
       )
 
-      Advert.index_definitions.delete_if { |spec| spec.fields==["title"] }
+      Advert.field_specs.delete(:category_id)
+      Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] || spec.fields == ["category_id"] }
 
       # You can ask for a unique index
 
@@ -521,7 +550,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         EOS
       )
 
-      Advert.index_definitions.delete_if { |spec| spec.fields==["title"] }
+      Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
 
       # You can ask for an index outside of the fields block
 
@@ -540,16 +569,16 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
       Advert.index_definitions.delete_if { |spec| spec.fields == ["title"] }
 
-      # The available options for the index function are `:unique` and `:name`
+      # The available options for the index function are :unique, :name, :where, and :length.
 
       class Advert < ActiveRecord::Base
-        index :title, unique: true, name: 'my_index'
+        index :title, unique: false, name: 'my_index', length: 10
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
           add_column :adverts, :title, :string, limit: 250, null: true#{charset_and_collation}
-          add_index :adverts, [:title], name: :my_index, unique: true
+          add_index :adverts, [:title], name: :my_index, length: 10
           #{"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
@@ -572,7 +601,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         EOS
       )
 
-      Advert.index_definitions.delete_if { |spec| spec.fields==["title", "category_id"] }
+      Advert.index_definitions.delete_if { |spec| spec.fields == ["title", "category_id"] }
 
       # Finally, you can specify that the migration generator should completely ignore an
       # index by passing its name to ignore_index in the model.
@@ -645,10 +674,10 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           remove_column :advertisements, :name
         EOS
         .and migrate_down(<<~EOS.strip)
-          add_column :advertisements, :name, :string, limit: 250, null: true#{charset_and_collation}
-          remove_column :advertisements, :body
-          remove_column :advertisements, :title
-          rename_table :advertisements, :adverts
+            add_column :advertisements, :name, :string, limit: 250, null: true#{charset_and_collation}
+            remove_column :advertisements, :body
+            remove_column :advertisements, :title
+            rename_table :advertisements, :adverts
         EOS
       )
 
@@ -665,9 +694,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           drop_table :adverts
         EOS
         .and migrate_down(<<~EOS.strip)
-          create_table "adverts"#{table_options}, force: :cascade do |t|
-            t.string "name", limit: 250#{charset_and_collation}
-          end
+            create_table "adverts"#{table_options}, force: :cascade do |t|
+              t.string "name", limit: 250#{charset_and_collation}
+            end
         EOS
       )
 
@@ -700,8 +729,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
             add_index :adverts, [:type], name: :on_type
           EOS
           .and migrate_down(<<~EOS.strip)
-            remove_index :adverts, name: :on_type
-            remove_column :adverts, :type
+              remove_index :adverts, name: :on_type
+              remove_column :adverts, :type
           EOS
         )
       end
@@ -709,7 +738,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       Advert.field_specs.delete(:type)
       nuke_model_class(SuperFancyAdvert)
       nuke_model_class(FancyAdvert)
-      Advert.index_definitions.delete_if { |spec| spec.fields==["type"] }
+      Advert.index_definitions.delete_if { |spec| spec.fields == ["type"] }
 
       ## Coping with multiple changes
 
@@ -744,8 +773,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
           change_column :adverts, :name, :string, limit: 250, null: true, default: "No Name"#{charset_and_collation}
         EOS
         .and migrate_down(<<~EOS.strip)
-          change_column :adverts, :name, :string, limit: 250, null: true, default: "Untitled"#{charset_and_collation}
-          rename_column :adverts, :name, :title
+            change_column :adverts, :name, :string, limit: 250, null: true, default: "Untitled"#{charset_and_collation}
+            rename_column :adverts, :name, :title
         EOS
       )
 
@@ -809,8 +838,6 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       expect(User.field_specs.keys).to eq(['company'])
       expect(User.field_specs['company'].options[:ruby_default]&.call).to eq("BigCorp")
 
-      nuke_model_class(User)
-
       ## validates
 
       # DeclareSchema can accept a validates hash in the field options.
@@ -831,44 +858,6 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       up, _down = Generators::DeclareSchema::Migration::Migrator.run
       ActiveRecord::Migration.class_eval(up)
       expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{:presence=>true, :uniqueness=>{:case_sensitive=>false}}")
-
-      # DeclareSchema supports has_and_belongs_to_many relationships and generates the intersection ("join") table
-      # with appropriate primary key, indexes, and foreign keys.
-
-      class Advertiser < ActiveRecord::Base
-        declare_schema do
-          string :name, limit: 250
-        end
-        has_and_belongs_to_many :creatives
-      end
-      class Creative < ActiveRecord::Base
-        declare_schema do
-          string :url, limit: 500
-        end
-        has_and_belongs_to_many :advertisers
-      end
-
-      expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-        migrate_up(<<~EOS.strip)
-          create_table :advertisers, id: :bigint#{create_table_charset_and_collation} do |t|
-            t.string :name, limit: 250, null: false#{charset_and_collation}
-          end
-          create_table :advertisers_creatives, primary_key: [:advertiser_id, :creative_id]#{create_table_charset_and_collation} do |t|
-            t.integer :advertiser_id, limit: 8, null: false
-            t.integer :creative_id, limit: 8, null: false
-          end
-          create_table :creatives, id: :bigint#{create_table_charset_and_collation} do |t|
-            t.string :url, limit: 500, null: false#{charset_and_collation}
-          end
-          add_index :advertisers_creatives, [:creative_id], name: :index_advertisers_creatives_on_creative_id
-          add_foreign_key :advertisers_creatives, :advertisers, column: :advertiser_id, name: :advertisers_creatives_FK1
-          add_foreign_key :advertisers_creatives, :creatives, column: :creative_id, name: :advertisers_creatives_FK2
-      EOS
-      )
-
-      nuke_model_class(Ad)
-      nuke_model_class(Advertiser)
-      nuke_model_class(Creative)
     end
 
     context 'models with the same parent foreign key relation' do
@@ -892,24 +881,24 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         end
       end
 
-      it 'will generate unique constraint names' do
+      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: :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
+            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
         EOS
         )
         migrate

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

@@ -21,9 +21,9 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
     describe 'instance methods' do
       let(:connection) { instance_double(ActiveRecord::Base.connection.class) }
       let(:model) { instance_double('Model', table_name: 'models', connection: connection) }
-      let(:foreign_key_column) { :network_id }
-      let(:options) { { child_table: 'networks' } }
-      subject { described_class.new(foreign_key_column, **options)}
+      let(:foreign_key) { :network_id }
+      let(:options) { {} }
+      subject { described_class.new(model, foreign_key, **options)}
 
       before do
         allow(model.connection).to receive(:index_name).with(any_args) { 'index_on_network_id' }
@@ -31,44 +31,45 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
 
       describe '#initialize' do
         it 'normalizes symbols to strings' do
-          expect(subject.foreign_key_column).to eq('network_id')
+          expect(subject.foreign_key).to eq('network_id')
           expect(subject.parent_table_name).to eq('networks')
         end
 
         context 'when most options passed' do
-          let(:options) { { child_table: 'networks', parent_table: :networks } }
+          let(:options) { { parent_table: :networks, foreign_key: :the_network_id } }
 
           it 'normalizes symbols to strings' do
-            expect(subject.foreign_key_column).to eq('network_id')
+            expect(subject.foreign_key).to eq('network_id')
+            expect(subject.foreign_key_name).to eq('the_network_id')
             expect(subject.parent_table_name).to eq('networks')
-            expect(subject.foreign_key_column).to eq('network_id')
-            expect(subject.constraint_name).to eq('index_networks_on_network_id')
-            expect(subject.dependent).to be_nil
+            expect(subject.foreign_key).to eq('network_id')
+            expect(subject.constraint_name).to eq('index_on_network_id')
+            expect(subject.on_delete_cascade).to be_falsey
           end
         end
 
         context 'when all options passed' do
-          let(:options) { { child_table: 'networks', parent_table: :networks, 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_column).to eq('network_id')
+            expect(subject.foreign_key).to eq('network_id')
+            expect(subject.foreign_key_name).to eq('the_network_id')
             expect(subject.parent_table_name).to eq('networks')
             expect(subject.constraint_name).to eq('constraint_1')
-            expect(subject.dependent).to eq(:delete)
+            expect(subject.on_delete_cascade).to be_truthy
           end
         end
 
         context 'when constraint name passed as empty string' do
-          let(:options) { { child_table: 'networks', constraint_name: "" } }
-
+          let(:options) { { constraint_name: "" } }
           it 'defaults to rails constraint name' do
-            expect(subject.constraint_name).to eq("index_networks_on_network_id")
+            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_networks_on_network_id")
+            expect(subject.constraint_name).to eq("index_on_network_id")
           end
         end
       end
@@ -84,13 +85,13 @@ RSpec.describe DeclareSchema::Model::ForeignKeyDefinition do
         allow(connection).to receive(:index_name).with('models', column: 'network_id') { }
       end
 
-      describe '.for_table' do
-        subject { described_class.for_table(old_table_name, model.connection) }
+      describe '.for_model' do
+        subject { described_class.for_model(model, old_table_name) }
 
-        it 'returns definitions' do
-          expect(subject.map(&:key)).to eq([
-            ["networks", "network_id", nil]
-          ])
+        it 'returns new object' do
+          expect(subject.size).to eq(1), subject.inspect
+          expect(subject.first).to be_kind_of(described_class)
+          expect(subject.first.foreign_key).to eq('network_id')
         end
       end
     end

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

@@ -8,20 +8,19 @@ end
 require_relative '../../../../lib/declare_schema/model/habtm_model_shim'
 
 RSpec.describe DeclareSchema::Model::HabtmModelShim do
-  let(:join_table) { "customers_users" }
-  let(:foreign_keys) { ["user_id", "customer_id"] }
-  let(:parent_table_names) { ["users", "customers"] }
-  let(:connection) { instance_double(ActiveRecord::Base.connection.class, "connection") }
+  let(:join_table) { "parent_1_parent_2" }
+  let(:foreign_keys) { ["parent_1_id", "parent_2_id"] }
+  let(:foreign_key_classes) { [Parent1, Parent2] }
 
   before do
     load File.expand_path('../prepare_testapp.rb', __dir__)
 
-    class User < ActiveRecord::Base
-      self.table_name = "users"
+    class Parent1 < ActiveRecord::Base
+      self.table_name = "parent_1s"
     end
 
-    class Customer < ActiveRecord::Base
-      self.table_name = "customers"
+    class Parent2 < ActiveRecord::Base
+      self.table_name = "parent_2s"
     end
   end
 
@@ -30,26 +29,27 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
       let(:reflection) { double("reflection", join_table: join_table,
                                               foreign_key: foreign_keys.first,
                                               association_foreign_key: foreign_keys.last,
-                                              active_record: User,
-                                              class_name: 'Customer',
-                                              klass: Customer) }
+                                              active_record: foreign_key_classes.first,
+                                              class_name: 'Parent1') }
       it 'returns a new object' do
         result = described_class.from_reflection(reflection)
 
         expect(result).to be_a(described_class)
-        expect(result.foreign_keys).to eq(foreign_keys.reverse)
-        expect(result.parent_table_names).to eq(parent_table_names.reverse)
       end
     end
   end
 
   describe 'instance methods' do
-    subject { described_class.new(join_table, foreign_keys, parent_table_names, connection: connection) }
+    let(:connection) { instance_double(ActiveRecord::Base.connection.class, "connection") }
+
+    subject { described_class.new(join_table, foreign_keys, foreign_key_classes, connection) }
 
     describe '#initialize' do
       it 'stores initialization attributes' do
         expect(subject.join_table).to eq(join_table)
-        expect(subject.foreign_keys).to eq(foreign_keys.reverse)
+        expect(subject.foreign_keys).to eq(foreign_keys)
+        expect(subject.foreign_key_classes).to be(foreign_key_classes)
+        expect(subject.connection).to be(connection)
       end
     end
 
@@ -67,52 +67,51 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
 
     describe '#field_specs' do
       it 'returns 2 field specs' do
-        field_specs = subject.field_specs
-        expect(field_specs.size).to eq(2), field_specs.inspect
-
-        expect(field_specs[foreign_keys.first]).to be_a(::DeclareSchema::Model::FieldSpec)
-        expect(field_specs[foreign_keys.first].model).to eq(subject)
-        expect(field_specs[foreign_keys.first].name.to_s).to eq(foreign_keys.first)
-        expect(field_specs[foreign_keys.first].type).to eq(:integer)
-        expect(field_specs[foreign_keys.first].position).to eq(1)
-
-        expect(field_specs[foreign_keys.last]).to be_a(::DeclareSchema::Model::FieldSpec)
-        expect(field_specs[foreign_keys.last].model).to eq(subject)
-        expect(field_specs[foreign_keys.last].name.to_s).to eq(foreign_keys.last)
-        expect(field_specs[foreign_keys.last].type).to eq(:integer)
-        expect(field_specs[foreign_keys.last].position).to eq(0)
+        result = subject.field_specs
+        expect(result.size).to eq(2), result.inspect
+
+        expect(result[foreign_keys.first]).to be_a(::DeclareSchema::Model::FieldSpec)
+        expect(result[foreign_keys.first].model).to eq(subject)
+        expect(result[foreign_keys.first].name.to_s).to eq(foreign_keys.first)
+        expect(result[foreign_keys.first].type).to eq(:integer)
+        expect(result[foreign_keys.first].position).to eq(0)
+
+        expect(result[foreign_keys.last]).to be_a(::DeclareSchema::Model::FieldSpec)
+        expect(result[foreign_keys.last].model).to eq(subject)
+        expect(result[foreign_keys.last].name.to_s).to eq(foreign_keys.last)
+        expect(result[foreign_keys.last].type).to eq(:integer)
+        expect(result[foreign_keys.last].position).to eq(1)
       end
     end
 
     describe '#primary_key' do
-      it 'returns false because there is no single-column PK for ActiveRecord to use' do
-        expect(subject.primary_key).to eq(false)
+      it 'returns false' do
+        expect(subject._declared_primary_key).to eq(false)
       end
     end
 
     describe '#_declared_primary_key' do
-      it 'returns the foreign key pair that are used as the primary key in the database' do
-        expect(subject._declared_primary_key).to eq(["customer_id", "user_id"])
+      it 'returns false' do
+        expect(subject._declared_primary_key).to eq(false)
       end
     end
 
     describe '#index_definitions_with_primary_key' do
       it 'returns 2 index definitions' do
-        index_definitions = subject.index_definitions_with_primary_key
-        expect(index_definitions.size).to eq(2), index_definitions.inspect
+        result = subject.index_definitions_with_primary_key
+        expect(result.size).to eq(2), result.inspect
 
-        expect(index_definitions.last).to be_a(::DeclareSchema::Model::IndexDefinition)
-        expect(index_definitions.last.name).to eq('PRIMARY')
-        expect(index_definitions.last.fields).to eq(foreign_keys.reverse)
-        expect(index_definitions.last.unique).to be_truthy
+        expect(result.first).to be_a(::DeclareSchema::Model::IndexDefinition)
+        expect(result.first.name).to eq('PRIMARY')
+        expect(result.first.fields).to eq(['parent_1_id', 'parent_2_id'])
+        expect(result.first.unique).to be_truthy
       end
     end
 
     context 'when table and foreign key names are long' do
       let(:join_table) { "advertiser_campaigns_tracking_pixels" }
-      let(:foreign_keys_and_table_names) { [["advertiser_id", "advertisers"], ["campaign_id", "campaigns"]] }
-      let(:foreign_keys) { foreign_keys_and_table_names.map(&:first) }
-      let(:parent_table_names) { foreign_keys_and_table_names.map(&:last) }
+      let(:foreign_keys) { ['advertiser_campaign', 'tracking_pixel'] }
+      let(:foreign_key_classes) { [Table1, Table2] }
 
       before do
         class Table1 < ActiveRecord::Base
@@ -125,40 +124,19 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
       end
 
       it 'returns two index definitions and does not raise a IndexNameTooLongError' do
-        indexes = subject.index_definitions_with_primary_key
-        expect(indexes.size).to eq(2), indexes.inspect
-        expect(indexes.last).to be_a(::DeclareSchema::Model::IndexDefinition)
-        expect(indexes.last.name).to eq('PRIMARY')
-        expect(indexes.last.fields).to eq(foreign_keys)
-        expect(indexes.last.unique).to be_truthy
-        expect(indexes.first).to be_a(::DeclareSchema::Model::IndexDefinition)
-        expect(indexes.first.name).to eq('index_advertiser_campaigns_tracking_pixels_on_campaign_id')
-        expect(indexes.first.fields).to eq([foreign_keys.last])
-        expect(indexes.first.unique).to be_falsey
+        result = subject.index_definitions_with_primary_key
+        expect(result.size).to eq(2), result.inspect
+        expect(result.first).to be_a(::DeclareSchema::Model::IndexDefinition)
+        expect(result.first.name).to eq('PRIMARY')
+        expect(result.first.fields).to eq(['advertiser_campaign', 'tracking_pixel'])
+        expect(result.first.unique).to be_truthy
       end
     end
 
     describe '#index_definitions' do
-      it 'returns index_definitions' do
-        indexes = subject.index_definitions
-        expect(indexes.size).to eq(1), indexes.inspect
-        expect(indexes.first.columns).to eq(["user_id"])
-        options = [:name, :unique, :where].map { |k| [k, indexes.first.send(k)] }.to_h
-        expect(options).to eq(name: "index_customers_users_on_user_id",
-                              unique: false,
-                              where: nil)
-      end
-    end
-
-    describe '#index_definitions_with_primary_key' do
       it 'returns index_definitions_with_primary_key' do
-        indexes = subject.index_definitions_with_primary_key
-        expect(indexes.size).to eq(2), indexes.inspect
-        expect(indexes.last.columns).to eq(["customer_id", "user_id"])
-        options = [:name, :unique, :where].map { |k| [k, indexes.last.send(k)] }.to_h
-        expect(options).to eq(name: "PRIMARY",
-                              unique: true,
-                              where: nil)
+        result = subject.index_definitions
+        expect(result.size).to eq(2), result.inspect
       end
     end
 
@@ -170,11 +148,18 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
 
     describe '#constraint_specs' do
       it 'returns 2 foreign keys' do
-        constraints = subject.constraint_specs
-        expect(constraints.map(&:key)).to eq([
-          ["customers", "customer_id", :delete],
-          ["users", "user_id", :delete]
-        ])
+        result = subject.constraint_specs
+        expect(result.size).to eq(2), result.inspect
+
+        expect(result.first).to be_a(::DeclareSchema::Model::ForeignKeyDefinition)
+        expect(result.first.foreign_key).to eq(foreign_keys.first)
+        expect(result.first.parent_table_name).to be(Parent1.table_name)
+        expect(result.first.on_delete_cascade).to be_truthy
+
+        expect(result.last).to be_a(::DeclareSchema::Model::ForeignKeyDefinition)
+        expect(result.last.foreign_key).to eq(foreign_keys.last)
+        expect(result.last.parent_table_name).to be(Parent2.table_name)
+        expect(result.last.on_delete_cascade).to be_truthy
       end
     end
   end