Fix corrupted_roles check: remove reference to missing 'override' column

Signed-off-by: Gaurav Talreja <gtalreja@redhat.com>

Author: Gauravtalreja1

definitions/checks/foreman/check_corrupted_roles.rb

@@ -32,7 +32,6 @@ def self.inconsistent_filter_perms
                  filters.role_id,
                  filters.search,
                  filters.taxonomy_search,
-                 filters.override,
                  filterings.id AS filtering_id,
                  permissions.id AS permission_id,
                  permissions.name AS permission_name,
@@ -52,8 +51,7 @@ def self.inconsistent_filter_perms
                           first.permission_name,
                           first.resource_type,
                           first.search,
-                          first.taxonomy_search,
-                          first.override
+                          first.taxonomy_search
           FROM (#{subquery}) first JOIN (#{subquery}) second
             ON first.filter_id = second.filter_id AND
               ((first.resource_type IS NOT NULL AND second.resource_type IS NULL)

definitions/procedures/foreman/fix_corrupted_roles.rb

@@ -34,30 +34,29 @@ def find_records_to_update(inconsistent_sets)
     def update_records(set)
       new_filter = create_filter set.first['role_id'],
         set.first['search'],
-        set.first['taxonomy_search'],
-        set.first['override']
+        set.first['taxonomy_search']
       set.each do |item|
         destroy_filtering item
         next if !new_filter || new_filter.empty?
         create_filtering item, new_filter
       end
     end
 
-    def create_filter(role_id, search, taxonomy_search, override)
+    def create_filter(role_id, search, taxonomy_search)
       feature(:foreman_database).query(
-        create_filter_query(search, role_id, taxonomy_search, override)
+        create_filter_query(search, role_id, taxonomy_search)
       ).first
     end
 
     def escape_val(value)
       value ? "'#{value}'" : 'NULL'
     end
 
-    def create_filter_query(search, role_id, taxonomy_search, override)
+    def create_filter_query(search, role_id, taxonomy_search)
       <<-SQL
         WITH rows AS (
-          INSERT INTO filters (search, role_id, taxonomy_search, override, created_at, updated_at)
-          VALUES (#{escape_val(search)}, #{role_id}, #{escape_val(taxonomy_search)}, '#{override}', '#{Time.now}', '#{Time.now}')
+          INSERT INTO filters (search, role_id, taxonomy_search, created_at, updated_at)
+          VALUES (#{escape_val(search)}, #{role_id}, #{escape_val(taxonomy_search)}, '#{Time.now}', '#{Time.now}')
           RETURNING id
           )
         SELECT id