MONGOID-5195 MONGOID-5237 fix logic checking for compare_time_by_ms (#5179)

Co-authored-by: Oleg Pudeyev <[email protected]>

Author: p-mongo

lib/mongoid/matcher/eq_impl.rb

@@ -25,9 +25,6 @@ module EqImpl
         else
           # When doing a comparison with Time objects, compare using millisecond precision
           if Mongoid.compare_time_by_ms
-            value == condition ||
-            value.is_a?(Array) && value.include?(condition)
-          else
             if value.kind_of?(Time) && condition.kind_of?(Time)
               time_eq?(value, condition)
             elsif value.is_a?(Array) && condition.kind_of?(Time)
@@ -42,6 +39,9 @@ module EqImpl
               value == condition ||
               value.is_a?(Array) && value.include?(condition)
             end
+          else
+            value == condition ||
+            value.is_a?(Array) && value.include?(condition)
           end
         end
       end

spec/integration/matcher_spec.rb

@@ -28,24 +28,24 @@
     context 'comparing millisecond precision' do
       let(:time_millis) {Time.utc(2021, 10, 25, 10, 30, 30, 581774)}
 
-      context 'with exact match' do
-        let(:query) do
-          {'started_at' => time_millis}
-        end
-
-        it_behaves_like 'is true'
+      context "when compare_time_by_ms feature flag is set" do
+        config_override :compare_time_by_ms, true
 
-        context 'and query has different timezone' do
-          let(:time_millis) do
-            Time.utc(2021, 10, 25, 10, 30, 30, 581345).in_time_zone("Stockholm")
+        context 'with exact match' do
+          let(:query) do
+            {'started_at' => time_millis}
           end
 
           it_behaves_like 'is true'
-        end
-      end
 
-      context "when compare_time_by_ms feature flag is set" do
-        config_override :compare_time_by_ms, true
+          context 'and query has different timezone' do
+            let(:time_millis) do
+              Time.utc(2021, 10, 25, 10, 30, 30, 581345).in_time_zone("Stockholm")
+            end
+
+            it_behaves_like 'is true'
+          end
+        end
 
         context 'with $in' do
           let(:query) do
@@ -54,31 +54,61 @@
 
           it_behaves_like 'is true'
         end
+
+        context 'when matching an element in an array' do
+          let(:document) do
+            Mop.new(:array_field => [time])
+          end
+
+          context 'with equals match' do
+            let(:query) do
+              {'array_field' => time_millis}
+            end
+
+            it_behaves_like 'is true'
+          end
+        end
       end
 
       context "when compare_time_by_ms feature flag is not set" do
         config_override :compare_time_by_ms, false
 
-        context 'with $in' do
+        context 'with exact match' do
           let(:query) do
-            {'started_at' => {:$in => [time_millis]}}
+            {'started_at' => time_millis}
           end
 
           it_behaves_like 'is false'
-        end
-      end
 
-      context 'when matching an element in an array' do
-        let(:document) do
-          Mop.new(:array_field => [time])
+          context 'and query has different timezone' do
+            let(:time_millis) do
+              Time.utc(2021, 10, 25, 10, 30, 30, 581345).in_time_zone("Stockholm")
+            end
+
+            it_behaves_like 'is true'
+          end
         end
 
-        context 'with equals match' do
+        context 'with $in' do
           let(:query) do
-            {'array_field' => time_millis}
+            {'started_at' => {:$in => [time_millis]}}
           end
 
-          it_behaves_like 'is true'
+          it_behaves_like 'is false'
+        end
+
+        context 'when matching an element in an array' do
+          let(:document) do
+            Mop.new(:array_field => [time])
+          end
+
+          context 'with equals match' do
+            let(:query) do
+              {'array_field' => time_millis}
+            end
+
+            it_behaves_like 'is false'
+          end
         end
       end
     end