remove includes from tenant_join_clauses

ManageIQ · Feb 4, 2020 · d7cf4fd · d7cf4fd
1 parent 89cdc02
commit d7cf4fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/app/models/cloud_tenant.rb b/app/models/cloud_tenant.rb
@@ -185,7 +185,6 @@ def self.post_refresh_ems(ems_id, _)
   end
 
   def self.tenant_joins_clause(scope)
-    scope.includes(:source_tenant, :ext_management_system)
-         .left_joins(:source_tenant, :ext_management_system)
+    scope.left_joins(:source_tenant, :ext_management_system)
   end
 end
diff --git a/app/models/flavor.rb b/app/models/flavor.rb
@@ -44,8 +44,7 @@ def self.class_by_ems(ext_management_system)
   end
 
   def self.tenant_joins_clause(scope)
-    scope.includes(:cloud_tenants => :source_tenant, :ext_management_system => {})
-         .left_joins(:cloud_tenants => :source_tenant, :ext_management_system => {})
+    scope.left_joins(:cloud_tenants => :source_tenant, :ext_management_system => {})
   end
 
   # Create a flavor as a queued task and return the task id. The queue name and

diff --git a/app/models/mixins/cloud_tenancy_mixin.rb b/app/models/mixins/cloud_tenancy_mixin.rb
@@ -13,8 +13,7 @@ def tenant_id_clause_format(tenant_ids)
     end
 
     def tenant_joins_clause(scope)
-      scope.includes(:cloud_tenant => :source_tenant, :ext_management_system => {})
-           .left_joins(:cloud_tenant => :source_tenant, :ext_management_system => {})
+      scope.left_joins(:cloud_tenant => :source_tenant, :ext_management_system => {})
     end
   end
 end