Modify container_quota_items unique index according to latest plans

Modify container_quota_items unique index according to latest plans, where we want to keep archived quota_items untouched.
ManageIQ · May 10, 2018 · d4d9d96 · d4d9d96
1 parent 88ff3b8
commit d4d9d96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/db/migrate/20180109102630_clean_up_duplicates_in_containers_tables.rb b/db/migrate/20180109102630_clean_up_duplicates_in_containers_tables.rb
@@ -77,7 +77,7 @@ def cleanup_duplicate_data_delete_all(model, unique_index_columns)
     ContainerEnvVar            => %i(container_id name value field_path),
     ContainerLimitItem         => %i(container_limit_id resource item_type),
     ContainerPortConfig        => %i(container_id ems_ref),
-    ContainerQuotaItem         => %i(container_quota_id resource),
+    ContainerQuotaItem         => %i(container_quota_id resource quota_desired quota_enforced quota_observed),
     ContainerQuotaScope        => %i(container_quota_id scope),
     ContainerServicePortConfig => %i(container_service_id name),
     ContainerTemplateParameter => %i(container_template_id name),

diff --git a/db/migrate/20180109102659_add_unique_indexes_to_containers_tables.rb b/db/migrate/20180109102659_add_unique_indexes_to_containers_tables.rb
@@ -54,7 +54,8 @@ def change
               :unique => true,
               :name   => "index_container_port_configs_unique_multi_column"
     add_index :container_quota_items,
-              %i(container_quota_id resource),
+              %i(container_quota_id resource quota_desired quota_enforced quota_observed),
+              :where  => "deleted_on IS NULL",
               :unique => true
     add_index :container_quota_scopes,
               %i(container_quota_id scope),