reports separate includes from preloads

ManageIQ · Jan 31, 2020 · 745352d · 745352d
1 parent 0d1f966
commit 745352d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/app/models/miq_report/generator.rb b/app/models/miq_report/generator.rb
@@ -80,10 +80,14 @@ def table2class(table)
     @table2class[table]
   end
 
+  # models that are preloaded for later use
   def get_include_for_find
-    get_include.deep_merge(include_for_find || {}).presence
+    include_for_find.presence
   end
 
+  # models that are necessary / in the SELECT, WHERE, or ORDER clause
+  #
+  # get from include hash or derive from col_order)
   def get_include
     include_as_hash(include.presence || invent_report_includes)
   end

diff --git a/spec/models/miq_report/generator_spec.rb b/spec/models/miq_report/generator_spec.rb
@@ -165,10 +165,10 @@
       expect(rpt.get_include_for_find).to be_nil
     end
 
-    it "includes virtual_includes from virtual_attributes that are not sql friendly" do
+    it "does not includes virtual_includes from virtual_attributes that are not sql friendly" do
       rpt = MiqReport.new(:db   => "VmOrTemplate",
                           :cols => %w(name platform))
-      expect(rpt.get_include_for_find).to eq(:platform => {})
+      expect(rpt.get_include_for_find).to be_nil
     end
 
     it "does not include sql friendly virtual_attributes" do
@@ -177,30 +177,12 @@
       expect(rpt.get_include_for_find).to be_nil
     end
 
-    it "uses include and include_as_hash" do
+    it "uses only include_for_find" do
       rpt = MiqReport.new(:db               => "VmOrTemplate",
                           :cols             => %w(name platform),
                           :include          => {:host => {:columns => %w(name)}, :storage => {:columns => %w(name)}},
                           :include_for_find => {:snapshots => {}})
-      expect(rpt.get_include_for_find).to eq(:platform => {}, :host => {}, :storage => {}, :snapshots => {})
-    end
-
-    it "uses col, col_order, and virtual attributes and ignores empty include" do
-      # it also allows cols to override col_order for requesting extra columns
-      rpt = MiqReport.new(:db               => "VmOrTemplate",
-                          :include          => {},
-                          :cols             => %w[name v_datastore_path],
-                          :col_order        => %w(name host.name storage.name),
-                          :include_for_find => {:snapshots => {}})
-      expect(rpt.get_include_for_find).to eq(:v_datastore_path => {}, :host => {}, :storage => {}, :snapshots => {})
-    end
-
-    it "uses col_order and virtual attributes" do
-      rpt = MiqReport.new(:db               => "VmOrTemplate",
-                          :include          => {},
-                          :col_order        => %w[name v_datastore_path host.name storage.name],
-                          :include_for_find => {:snapshots => {}})
-      expect(rpt.get_include_for_find).to eq(:v_datastore_path => {}, :host => {}, :storage => {}, :snapshots => {})
+      expect(rpt.get_include_for_find).to eq(:snapshots => {})
     end
   end