app/services/katello/applicability/applicable_content_helper.rb in katello-3.18.5 vs app/services/katello/applicability/applicable_content_helper.rb in katello-4.0.0.rc1

- old
+ new

@@ -120,25 +120,23 @@ "WHERE katello_host_installed_packages.host_id = " \ "#{content_facet.host.id} ORDER BY katello_installed_packages.name, katello_installed_packages.evr DESC" end def applicable_differences - ActiveRecord::Base.connection.uncached do - consumer_ids = content_facet.send(applicable_units).pluck("#{content_unit_class.table_name}.id") - content_ids = fetch_content_ids + consumer_ids = content_facet.send(applicable_units).pluck("#{content_unit_class.table_name}.id") + content_ids = fetch_content_ids - to_remove = consumer_ids - content_ids - to_add = content_ids - consumer_ids + to_remove = consumer_ids - content_ids + to_add = content_ids - consumer_ids - [to_add, to_remove] - end + [to_add, to_remove] end def insert(applicable_ids) unless applicable_ids.empty? inserts = applicable_ids.map { |applicable_id| "(#{applicable_id.to_i}, #{content_facet.id.to_i})" } sql = "INSERT INTO #{content_facet_association_class.table_name} (#{content_unit_association_id}, content_facet_id) VALUES #{inserts.join(', ')}" - ActiveRecord::Base.connection.exec_insert(sql) + ActiveRecord::Base.connection.execute(sql) end end def remove(applicable_ids) content_facet_association_class.where(:content_facet_id => content_facet.id, content_unit_association_id => applicable_ids).delete_all