Added support for async methods with Active Record 7.1

.github/workflows/build.yml

@@ -6,6 +6,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - ruby: 3.1
+            gemfile: gemfiles/activerecord71.gemfile
           - ruby: 3.1
             gemfile: Gemfile
           - ruby: "3.0"

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.2.0 (unreleased)
+
+- Added support for async methods with Active Record 7.1
+
 ## 6.1.0 (2022-04-05)
 
 - Added `expand_range` option

gemfiles/activerecord71.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rake"
+gem "minitest"
+gem "activerecord", "~> 7.1.0.alpha", github: "rails/rails"
+gem "pg"
+gem "mysql2"
+gem "sqlite3"

lib/groupdate/magic.rb

@@ -125,6 +125,10 @@ def initialize(**options)
       end
 
       def perform(relation, result, default_value:)
+        if defined?(ActiveRecord::Promise) && result.is_a?(ActiveRecord::Promise)
+          return result.then { |r| perform(relation, r, default_value: default_value) }
+        end
+
         multiple_groups = relation.group_values.size > 1
 
         check_nils(result, multiple_groups, relation)

test/adapters/mysql.rb

@@ -1 +1,5 @@
-ActiveRecord::Base.establish_connection adapter: "mysql2", database: "groupdate_test"
+options = {}
+if ActiveRecord::VERSION::STRING.to_f == 7.1
+  options[:prepared_statements] = true
+end
+ActiveRecord::Base.establish_connection adapter: "mysql2", database: "groupdate_test", **options

test/async_test.rb

@@ -0,0 +1,73 @@
+require_relative "test_helper"
+
+class AsyncTest < Minitest::Test
+  def setup
+    skip if ActiveRecord::VERSION::STRING.to_f < 7.1 || enumerable?
+    super
+  end
+
+  def test_count
+    create_user "2013-05-01"
+    create_user "2013-05-03"
+    create_user "2013-05-03", 9
+    promise = User.group_by_day(:created_at).async_count
+    expected = {
+      Date.parse("2013-05-01") => 1,
+      Date.parse("2013-05-02") => 0,
+      Date.parse("2013-05-03") => 2
+    }
+    assert_equal expected, promise.value
+  end
+
+  def test_sum
+    create_user "2013-05-01"
+    create_user "2013-05-03"
+    create_user "2013-05-03", 9
+    promise = User.group_by_day(:created_at).async_sum(:score)
+    expected = {
+      Date.parse("2013-05-01") => 1,
+      Date.parse("2013-05-02") => 0,
+      Date.parse("2013-05-03") => 10
+    }
+    assert_equal expected, promise.value
+  end
+
+  def test_minimum
+    create_user "2013-05-01"
+    create_user "2013-05-03"
+    create_user "2013-05-03", 9
+    promise = User.group_by_day(:created_at).async_minimum(:score)
+    expected = {
+      Date.parse("2013-05-01") => 1,
+      Date.parse("2013-05-02") => nil,
+      Date.parse("2013-05-03") => 1
+    }
+    assert_equal expected, promise.value
+  end
+
+  def test_maximum
+    create_user "2013-05-01"
+    create_user "2013-05-03"
+    create_user "2013-05-03", 9
+    promise = User.group_by_day(:created_at).async_maximum(:score)
+    expected = {
+      Date.parse("2013-05-01") => 1,
+      Date.parse("2013-05-02") => nil,
+      Date.parse("2013-05-03") => 9
+    }
+    assert_equal expected, promise.value
+  end
+
+  def test_average
+    create_user "2013-05-01"
+    create_user "2013-05-03"
+    create_user "2013-05-03", 9
+    promise = User.group_by_day(:created_at).async_average(:score)
+    expected = {
+      Date.parse("2013-05-01") => 1,
+      Date.parse("2013-05-02") => nil,
+      Date.parse("2013-05-03") => 5
+    }
+    assert_equal expected, promise.value
+  end
+end