Merge pull request #16608 from imtayadeway/bug/miq-expression-field-v…

…alues

Handle autoload error not caught by safe_constantize
(cherry picked from commit 7a5fd37)

https://bugzilla.redhat.com/show_bug.cgi?id=1522846

lib/miq_expression/field.rb

@@ -21,7 +21,12 @@ def self.is_field?(field)
     return false unless field.kind_of?(String)
     match = REGEX.match(field)
     return false unless match
-    model = match[:model_name].safe_constantize
+    model =
+      begin
+        match[:model_name].safe_constantize
+      rescue LoadError
+        nil
+      end
     return false unless model
     !!(model < ApplicationRecord)
   end

spec/lib/miq_expression_spec.rb

@@ -161,6 +161,11 @@
       expect(sql).to eq("\"vms\".\"name\" = \"vms\".\"name\"")
     end
 
+    it "will handle values that look like they contain MiqExpression-encoded constants but cannot be loaded" do
+      sql, * = described_class.new("=" => {"field" => "Vm-name", "value" => "VM-name"}).to_sql
+      expect(sql).to eq(%q("vms"."name" = 'VM-name'))
+    end
+
     it "generates the SQL for a < expression" do
       sql, * = described_class.new("<" => {"field" => "Vm.hardware-cpu_sockets", "value" => "2"}).to_sql
       expect(sql).to eq("\"hardwares\".\"cpu_sockets\" < 2")