Merge pull request #13675 from kbrock/report_both_includes_super

Reports: remove need to declare includes

app/models/miq_report/generator.rb

@@ -81,7 +81,16 @@ def table2class(table)
  end
 
  def get_include_for_find
- (include_as_hash || {}).deep_merge(include_for_find || {}).presence
+ (include_as_hash.presence || invent_includes).deep_merge(include_for_find || {}).presence
+ end
+
+ def invent_includes
+ return {} unless col_order
+ col_order.each_with_object({}) do |col, ret|
+ next unless col.include?(".")
+ *rels, _col = col.split(".")
+ rels.inject(ret) { |h, rel| h[rel.to_sym] ||= {} } unless col =~ /managed\./
+ end
  end
 
  def include_as_hash(includes = include, klass = nil)

product/views/CloudObjectStoreContainer-cloud_object_store_containers.yaml

@@ -23,19 +23,6 @@ cols:
 - bytes
 - object_count
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- cloud_tenant:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-
-# Included tables and columns for query performance
-# include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - key

product/views/CloudObjectStoreContainer.yaml

@@ -23,19 +23,6 @@ cols:
 - bytes
 - object_count
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- cloud_tenant:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-
-# Included tables and columns for query performance
-# include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - key

product/views/CloudObjectStoreObject-cloud_object_store_objects.yaml

@@ -24,21 +24,6 @@ cols:
 - last_modified
 - etag
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- cloud_object_store_container:
- columns:
- - key
- cloud_tenant:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-# Included tables and columns for query performance
-# include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - key

product/views/CloudObjectStoreObject.yaml

@@ -24,21 +24,6 @@ cols:
 - last_modified
 - etag
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- cloud_object_store_container:
- columns:
- - key
- cloud_tenant:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-# Included tables and columns for query performance
-# include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - key

product/views/CloudSubnet.yaml

@@ -26,15 +26,6 @@ cols:
 - dns_nameservers_show
 - total_vms
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- ext_management_system:
- columns:
- - name
-
-# Included tables and columns for query performance
-include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - name

product/views/CloudTenant.yaml

@@ -22,15 +22,6 @@ cols:
 - name
 - total_vms
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- ext_management_system:
- columns:
- - name
-
-# Included tables and columns for query performance
-include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - name

product/views/CloudVolume-based_volumes.yaml

@@ -25,19 +25,6 @@ cols:
 - volume_type
 - bootable
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- availability_zone:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-
-# Included tables and columns for query performance
-# include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - name

product/views/CloudVolume.yaml

@@ -25,18 +25,6 @@ cols:
 - volume_type
 - bootable
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- availability_zone:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-# Included tables and columns for query performance
-# include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - name

product/views/CloudVolumeBackup-cloud_volume_backups.yaml

@@ -23,19 +23,6 @@ cols:
 - size
 - status
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- cloud_volume:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-
-# Included tables and columns for query performance
-# include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - name

product/views/CloudVolumeBackup.yaml

@@ -23,16 +23,6 @@ cols:
 - size
 - status
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- cloud_volume:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-
 # Included tables and columns for query performance
 # include_for_find:
 

product/views/CloudVolumeSnapshot-cloud_volume_snapshots.yaml

@@ -24,16 +24,6 @@ cols:
 - status
 - total_based_volumes
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- cloud_volume:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-
 # Included tables and columns for query performance
 # include_for_find:
 

product/views/CloudVolumeSnapshot.yaml

@@ -24,16 +24,6 @@ cols:
 - status
 - total_based_volumes
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- cloud_volume:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-
 # Included tables and columns for query performance
 # include_for_find:
 

product/views/Container.yaml

@@ -22,18 +22,6 @@ cols:
 - name
 - state
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- container_group:
- columns:
- - name
- container_image:
- columns:
- - name
-
-# Included tables and columns for query performance
-include_for_find:
-
 # Order of columns (from all tables)
 col_order: 
 - name

product/views/ContainerBuild.yaml

@@ -24,19 +24,6 @@ cols:
 - output_name
 - completion_deadline_seconds
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- container_project:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-
-# Included tables and columns for query performance
-include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - name

product/views/ContainerGroup.yaml

@@ -26,18 +26,6 @@ cols:
 - dns_policy
 - running_containers_summary
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- container_project:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-# Included tables and columns for query performance
-include_for_find:
-
 # Order of columns (from all tables)
 col_order: 
 - name

product/views/ContainerImage.yaml

@@ -24,15 +24,6 @@ cols:
 - image_ref
 - display_registry
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- ext_management_system:
- columns:
- - name
-
-# Included tables and columns for query performance
-include_for_find:
-
 # Order of columns (from all tables)
 col_order: 
 - name

product/views/ContainerImageRegistry.yaml

@@ -22,14 +22,6 @@ cols:
 - host
 - port
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- ext_management_system:
- columns:
- - name
-# Included tables and columns for query performance
-include_for_find:
-
 # Order of columns (from all tables)
 col_order: 
 - host

product/views/ContainerNode.yaml

@@ -25,15 +25,6 @@ cols:
 - kernel_version
 - container_runtime_version
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- ext_management_system:
- columns:
- - name
-
-# Included tables and columns for query performance
-include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - name

product/views/ContainerProject.yaml

@@ -28,15 +28,6 @@ cols:
 - containers_count
 - images_count
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- ext_management_system:
- columns:
- - name
-
-# Included tables and columns for query performance
-include_for_find:
-
 # Order of columns (from all tables)
 col_order:
 - name

product/views/ContainerReplicator.yaml

@@ -23,18 +23,6 @@ cols:
 - replicas
 - current_replicas
 
-# Included tables (joined, has_one, has_many) and columns
-include:
- container_project:
- columns:
- - name
- ext_management_system:
- columns:
- - name
-
-# Included tables and columns for query performance
-include_for_find:
-
 # Order of columns (from all tables)
 col_order: 
 - name