Properly normalize scopes as keys

Author: rmosolgo

lib/graphql/dataloader/active_record_association_source.rb

@@ -12,6 +12,14 @@ def initialize(association, scope = nil)
         @scope = scope
       end
 
+      def self.batch_key_for(association, scope = nil)
+        if scope
+          [association, scope.to_sql]
+        else
+          [association]
+        end
+      end
+
       def load(record)
         if (assoc = record.association(@association)).loaded?
           assoc.target

spec/graphql/dataloader/active_record_association_source_spec.rb

@@ -126,6 +126,29 @@
       assert_includes log, 'WHERE "albums"."id" = ?  [["id", 3]]'
     end
 
+    it_dataloads "works with collection associations with scope" do |d|
+      wilco = ::Band.find(4)
+      chon = ::Band.find(3)
+      albums_by_band = nil
+      log = with_active_record_log(colorize: false) do
+        one_month_ago = 1.month.ago.end_of_day
+        albums_by_band_1 = d.with(GraphQL::Dataloader::ActiveRecordAssociationSource, :albums, Album.where("created_at >= ?", one_month_ago)).request(wilco)
+        albums_by_band_2 = d.with(GraphQL::Dataloader::ActiveRecordAssociationSource, :albums, Album.where("created_at >= ?", one_month_ago)).request(chon)
+        albums_by_band = [albums_by_band_1.load, albums_by_band_2.load]
+      end
+
+      assert_equal [[6], [4, 5]], albums_by_band.map { |al| al.map(&:id) }
+      assert_includes log, 'SELECT "albums".* FROM "albums" WHERE (created_at >= ?) AND "albums"."band_id" IN (?, ?)'
+
+      albums = nil
+      log = with_active_record_log(colorize: false) do
+        albums = d.with(GraphQL::Dataloader::ActiveRecordSource, Album).load_all([3,4,5,6])
+      end
+
+      assert_equal [3,4,5,6], albums.map(&:id)
+      assert_includes log, 'WHERE "albums"."id" IN (?, ?, ?, ?)  [["id", 3], ["id", 4], ["id", 5], ["id", 6]]'
+    end
+
     if Rails::VERSION::STRING > "7.1" # not supported in <7.1
       it_dataloads "loads with composite primary keys and warms the cache" do |d|
         my_first_car = ::Album.find(2)

spec/support/active_record_setup.rb

@@ -70,6 +70,7 @@
       t.integer :band_id
       t.string :band_name
       t.integer :band_genre
+      t.timestamps
     end
 
     create_table :books do |t|