Merge pull request #18369 from lpichler/remove_value2tag_for_count_fi…

…eld_in_miq_expression

Remove value2tag for count field in MiqExpression

lib/miq_expression.rb

@@ -620,9 +620,9 @@ def self.operands2rubyvalue(operator, ops, context_type)
         end
       end
     elsif ops["count"]
-      ref, count = value2tag(ops["count"])
-      field = "<count ref=#{ref}>#{count}</count>"
-      [field, quote(ops["value"], "integer")]
+      target = parse_field_or_tag(ops["count"])
+      fld = "<count ref=#{target.model.to_s.downcase}>#{target.tag_path_with}</count>"
+      [fld, quote(ops["value"], target.column_type)]
     elsif ops["regkey"]
       if operator == "key exists"
         "<registry key_exists=1, type=boolean>#{ops["regkey"].strip}</registry>  == 'true'"

lib/miq_expression/count_field.rb

@@ -22,6 +22,10 @@ def to_s
     [model, *associations].join(".")
   end
 
+  def column_type
+    :integer
+  end
+
   private
 
   def tag_values

spec/lib/miq_expression_spec.rb

@@ -967,7 +967,7 @@
 
   describe "#to_ruby" do
     it "generates the ruby for a = expression with count" do
-      actual = described_class.new("=" => {"count" => "Vm-snapshots", "value" => "1"}).to_ruby
+      actual = described_class.new("=" => {"count" => "Vm.snapshots", "value" => "1"}).to_ruby
       expected = "<count ref=vm>/virtual/snapshots</count> == 1"
       expect(actual).to eq(expected)
     end
@@ -985,7 +985,7 @@
     end
 
     it "generates the ruby for a < expression with count" do
-      actual = described_class.new("<" => {"count" => "Vm-snapshots", "value" => "2"}).to_ruby
+      actual = described_class.new("<" => {"count" => "Vm.snapshots", "value" => "2"}).to_ruby
       expected = "<count ref=vm>/virtual/snapshots</count> < 2"
       expect(actual).to eq(expected)
     end
@@ -997,7 +997,7 @@
     end
 
     it "generates the ruby for a > expression with count" do
-      actual = described_class.new(">" => {"count" => "Vm-snapshots", "value" => "2"}).to_ruby
+      actual = described_class.new(">" => {"count" => "Vm.snapshots", "value" => "2"}).to_ruby
       expected = "<count ref=vm>/virtual/snapshots</count> > 2"
       expect(actual).to eq(expected)
     end
@@ -1009,7 +1009,7 @@
     end
 
     it "generates the ruby for a >= expression with count" do
-      actual = described_class.new(">=" => {"count" => "Vm-snapshots", "value" => "2"}).to_ruby
+      actual = described_class.new(">=" => {"count" => "Vm.snapshots", "value" => "2"}).to_ruby
       expected = "<count ref=vm>/virtual/snapshots</count> >= 2"
       expect(actual).to eq(expected)
     end
@@ -1021,7 +1021,7 @@
     end
 
     it "generates the ruby for a <= expression with count" do
-      actual = described_class.new("<=" => {"count" => "Vm-snapshots", "value" => "2"}).to_ruby
+      actual = described_class.new("<=" => {"count" => "Vm.snapshots", "value" => "2"}).to_ruby
       expected = "<count ref=vm>/virtual/snapshots</count> <= 2"
       expect(actual).to eq(expected)
     end
@@ -1033,7 +1033,7 @@
     end
 
     it "generates the ruby for a != expression with count" do
-      actual = described_class.new("!=" => {"count" => "Vm-snapshots", "value" => "2"}).to_ruby
+      actual = described_class.new("!=" => {"count" => "Vm.snapshots", "value" => "2"}).to_ruby
       expected = "<count ref=vm>/virtual/snapshots</count> != 2"
       expect(actual).to eq(expected)
     end