MONGOID-5484 - Bugfix: Numeric strings should correctly evolve into BigDecimal (i.e. respecting map_big_decimal_to_decimal128) (#5468)

* Fix evolution of String --> BigDecimal

* Update big_decimal_spec.rb

* Fix string spec

Co-authored-by: shields <[email protected]>

Author: johnnyshields

lib/mongoid/criteria/queryable/extensions/big_decimal.rb

@@ -33,7 +33,7 @@ def evolve(object)
                   end
                 # Always return on string for backwards compatibility with querying
                 # string-backed BigDecimal fields.
-                when BSON::Decimal128, String then obj
+                when BSON::Decimal128 then obj
                 else
                   if obj.numeric?
                     if Mongoid.map_big_decimal_to_decimal128

spec/mongoid/criteria/queryable/extensions/big_decimal_spec.rb

@@ -142,14 +142,14 @@
       end
 
       context "when provided a numeric" do
-        it "returns a string" do
+        it "returns a BSON::Decimal128" do
           expect(described_class.evolve(1)).to eq(BSON::Decimal128.new('1'))
         end
       end
 
-      context "when provided a bogus value" do
-        it "returns the value" do
-          expect(described_class.evolve(:bogus)).to eq(:bogus)
+      context "when provided a valid string" do
+        it "returns a BSON::Decimal128" do
+          expect(described_class.evolve('1')).to eq(BSON::Decimal128.new('1'))
         end
       end
 
@@ -159,9 +159,9 @@
         end
       end
 
-      context "when provided a valid string" do
-        it "returns the string" do
-          expect(described_class.evolve("1")).to eq("1")
+      context "when provided a bogus value" do
+        it "returns the value" do
+          expect(described_class.evolve(:bogus)).to eq(:bogus)
         end
       end
     end

spec/mongoid/criteria_spec.rb

@@ -2756,13 +2756,33 @@ def self.ages; self; end
             Band.create!(name: "Boards of Canada", sales: sales)
           end
 
-          let(:from_db) do
+          it "cannot find values when querying using a BigDecimal value" do
             Mongoid.map_big_decimal_to_decimal128 = true
-            Band.where(sales: sales.to_s).first
+            from_db = Band.where(sales: sales).first
+            expect(from_db).to eq(nil)
           end
 
-          it "finds the document by the big decimal value" do
-            expect(from_db).to eq(band)
+          it "cannot find values when querying using a string value" do
+            Mongoid.map_big_decimal_to_decimal128 = true
+            from_db = Band.where(sales: sales.to_s).first
+            expect(from_db).to eq(nil)
+          end
+
+          context "after converting value" do
+            before do
+              Mongoid.map_big_decimal_to_decimal128 = true
+              band.set(sales: band.sales)
+            end
+
+            it "can find values when querying using a BigDecimal value" do
+              from_db = Band.where(sales: sales).first
+              expect(from_db).to eq(band)
+            end
+
+            it "can find values when querying using a string value" do
+              from_db = Band.where(sales: sales.to_s).first
+              expect(from_db).to eq(band)
+            end
           end
         end
       end