Merge pull request #838 from rmosolgo/fix-relation-count

fix(RelationConnection) correctly count when ActiveRecord has already added an alias

lib/graphql/relay/relation_connection.rb

@@ -100,7 +100,12 @@ def relation_limit(relation)
 
       # If a relation contains a `.group` clause, a `.count` will return a Hash.
       def relation_count(relation)
-        count_or_hash = relation.count
+        count_or_hash = case relation
+        when ActiveRecord::Relation
+          relation.count(:all)
+        else # eg, Sequel::Dataset, don't mess up others
+          relation.count
+        end
         count_or_hash.is_a?(Integer) ? count_or_hash : count_or_hash.length
       end
 

spec/graphql/relay/relation_connection_spec.rb

@@ -481,6 +481,14 @@ def get_last_cursor(result)
   end
 
   describe "for an ActiveRecord::Relation" do
+    describe "#has_next_page" do
+      it "handles joined, aliased relations" do
+        relation = StarWars::Base.select("id AS crazy_id")
+        connection = GraphQL::Relay::RelationConnection.new(relation, { first: 1 })
+        assert connection.has_next_page
+      end
+    end
+
     describe "#edge_nodes" do
       it "returns the nodes for the current page" do
         # Offset