Merge pull request #11197 from carbonin/remove_composite_key_migrations

Remove composite primary key migration logic with no net effect (cherry picked from commit df3737f) https://bugzilla.redhat.com/show_bug.cgi?id=1377418
ManageIQ · Nov 3, 2016 · 1c0211c · 1c0211c
1 parent 9b4dcfd
commit 1c0211c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 72 deletions.
diff --git a/db/migrate/20160106214719_add_composite_primary_keys_to_join_tables.rb b/db/migrate/20160106214719_add_composite_primary_keys_to_join_tables.rb
diff --git a/db/migrate/20160406195810_add_id_primary_key_to_join_tables.rb b/db/migrate/20160406195810_add_id_primary_key_to_join_tables.rb
@@ -18,34 +18,9 @@ class AddIdPrimaryKeyToJoinTables < ActiveRecord::Migration[5.0]
     network_ports_security_groups
   ).freeze
 
-  COMPOSITE_KEY_MAP = {
-    "cloud_tenants_vms"                                  => "cloud_tenant_id, vm_id",
-    "conditions_miq_policies"                            => "miq_policy_id, condition_id",
-    "configuration_locations_configuration_profiles"     => "configuration_location_id, configuration_profile_id",
-    "configuration_organizations_configuration_profiles" => "configuration_organization_id, configuration_profile_id",
-    "configuration_profiles_configuration_tags"          => "configuration_profile_id, configuration_tag_id",
-    "configuration_tags_configured_systems"              => "configured_system_id, configuration_tag_id",
-    "container_groups_container_services"                => "container_service_id, container_group_id",
-    "customization_scripts_operating_system_flavors"     => "customization_script_id, operating_system_flavor_id",
-    "direct_configuration_profiles_configuration_tags"   => "configuration_profile_id, configuration_tag_id",
-    "direct_configuration_tags_configured_systems"       => "configured_system_id, configuration_tag_id",
-    "key_pairs_vms"                                      => "authentication_id, vm_id",
-    "miq_groups_users"                                   => "miq_group_id, user_id",
-    "miq_roles_features"                                 => "miq_user_role_id, miq_product_feature_id",
-    "network_ports_security_groups"                      => "network_port_id, security_group_id",
-    "security_groups_vms"                                => "security_group_id, vm_id",
-    "storages_vms_and_templates"                         => "storage_id, vm_or_template_id"
-  }.freeze
-
   class MiqRegion < ActiveRecord::Base; end
 
   def up
-    say_with_time("Removing composite primary keys from join tables") do
-      COMPOSITE_KEY_MAP.keys.each do |table|
-        execute("ALTER TABLE #{table} DROP CONSTRAINT #{table}_pkey")
-      end
-    end
-
     JOIN_TABLES.each do |t|
       delete_remote_region_rows(t) if on_replication_target?
 
@@ -70,10 +45,6 @@ def down
     JOIN_TABLES.each do |t|
       remove_column t.to_sym, :id
     end
-
-    COMPOSITE_KEY_MAP.each do |table, key|
-      execute("ALTER TABLE #{table} ADD PRIMARY KEY (#{key})")
-    end
   end
 
   def delete_remote_region_rows(table)

diff --git a/spec/migrations/20160406195810_add_id_primary_key_to_join_tables_spec.rb b/spec/migrations/20160406195810_add_id_primary_key_to_join_tables_spec.rb
@@ -59,14 +59,4 @@
       end
     end
   end
-
-  migration_context :down do
-    it "recreates the composite primary key" do
-      migrate
-
-      described_class::JOIN_TABLES.each do |table|
-        expect(connection.primary_keys(table).count).to eq(2)
-      end
-    end
-  end
 end