MONGOID-4405 Check if relation is cyclic as well as embedded before querying

Author: estolfo

lib/mongoid/scopable.rb

@@ -117,7 +117,7 @@ def default_scopable?
       # @since 3.0.0
       def queryable
         crit = Threaded.current_scope(self) || Criteria.new(self)
-        crit.embedded = true if crit.klass.embedded?
+        crit.embedded = true if (crit.klass.embedded? && !crit.klass.cyclic?)
         crit
       end
 

spec/mongoid/relations/cyclic_spec.rb

@@ -21,6 +21,17 @@
       it "sets cyclic to true" do
         expect(document.cyclic).to be true
       end
+
+      context "when a query is executed" do
+
+        before do
+          document.save
+        end
+
+        it "queries the database, not memory" do
+          expect(Role.first).to be_a(Role)
+        end
+      end
     end
 
     context "when the name is not inflected easily" do
@@ -133,6 +144,17 @@ def is_root?
         expect(document.class.relations['child_mango']).to be_cascading_callbacks
       end
     end
+
+    context "when a query is executed" do
+
+      before do
+        document.save
+      end
+
+      it "queries the database, not memory" do
+        expect(Shelf.first).to be_a(Shelf)
+      end
+    end
   end
 
   context "when building a namespaced hierarchy" do