From 1d8d709650e50e7f3b37449e886c974aca7f4e95 Mon Sep 17 00:00:00 2001
From: Alex Pauly <alex.pauly@posteo.de>
Date: Fri, 3 Nov 2023 22:21:35 +0100
Subject: [PATCH 01/12] Implement custom preloads (#129)

---
 README.md                                | 61 +++++++++++++++++++
 lib/goldiloader.rb                       |  1 +
 lib/goldiloader/active_record_patches.rb |  5 ++
 lib/goldiloader/auto_include_context.rb  |  2 +
 lib/goldiloader/custom_preloads.rb       | 42 +++++++++++++
 spec/db/schema.rb                        | 38 ++++++++++++
 spec/goldiloader/goldiloader_spec.rb     | 75 ++++++++++++++++++++++++
 spec/spec_helper.rb                      |  2 +-
 8 files changed, 225 insertions(+), 1 deletion(-)
 create mode 100644 lib/goldiloader/custom_preloads.rb

diff --git a/README.md b/README.md
index 507b89c..a687908 100644
--- a/README.md
+++ b/README.md
@@ -219,6 +219,9 @@ Associations with any of the following options cannot be eager loaded:
 
 Goldiloader detects associations with any of these options and disables automatic eager loading on them.
 
+It might still be possible to eager load these with Goldiloader by using [custom preloads](#custom-preloads).
+
+
 ### Eager Loading Limitation Workarounds
 
 Most of the Rails limitations with eager loading can be worked around by pushing the problematic SQL into the database via database views. Consider the following example with associations that can't be eager loaded due to SQL limits:
@@ -274,6 +277,64 @@ class RecentPostReference < ActiveRecord::Base
 end
 ```
 
+## Custom Preloads
+
+In addition to preloading relations, you can also define custom preloads by yourself in your model. The only requirement is that you need to be able to perform a lookup for multiple records/ids and return a single Hash with the ids as keys.
+If that's the case, these preloads can nearly be anything. Some examples could be:
+
+- simple aggregations (count, sum, maximum, etc.)
+- more complex custom SQL queries
+- external API requests (ElasticSearch, Redis, etc.)
+- relations with primary keys stored in a `jsonb` column
+
+Here's how:
+
+```ruby
+class Blog < ActiveRecord::Base
+  has_many :posts
+  
+  def posts_count
+    goldiload do |ids|
+      # By default, `ids` will be an array of `Blog#id`s
+      Post
+        .where(blog_id: ids)
+        .group(:blog_id)
+        .count
+    end
+  end
+end
+```
+
+The first time you call the `posts_count` method, it will call the block with all model ids from the current context and reuse the result from the block for all other models in the context.
+
+A more complex example might use a custom primary key instead of `id`, use a non ActiveRecord API and have more complex return values than just scalar values:
+
+
+```ruby
+class Post < ActiveRecord::Base
+  def main_translator_reference
+    json_payload[:main_translator_reference]
+  end
+  
+  def main_translator
+    goldiload(key: :main_translator_reference) do |references|
+      # `references` will be an array of `Post#main_translator_reference`s
+      SomeExternalApi.fetch_translators(
+        id: references
+      ).index_by(&:id)
+    end
+  end
+end
+```
+
+**Note:** The `goldiload` method will use the `source_location` of the given block as a cache name to distinguish between multiple defined preloads. If this causes an issue for you, you can also pass a cache name explicitly as the first argument to the `goldiload` method.
+
+
+### Gotchas
+
+Even though the methods in the examples above (`posts_count`, `main_translator`) are actually instance methods, the block passed to `goldiload` should not contain any references to these instances, as this could break the internal lookup/caching mechanism. We prevent this for the `self` keyword, so you'll get a `NoMethodError`. If you get this, you might want to think about the implementation rather than just trying to work around the exception.
+
+
 ## Upgrading
 
 ### From 0.x, 1.x
diff --git a/lib/goldiloader.rb b/lib/goldiloader.rb
index f30c0ca..e54ecaf 100644
--- a/lib/goldiloader.rb
+++ b/lib/goldiloader.rb
@@ -3,6 +3,7 @@
 require 'active_support/all'
 require 'active_record'
 require 'goldiloader/compatibility'
+require 'goldiloader/custom_preloads'
 require 'goldiloader/auto_include_context'
 require 'goldiloader/scope_info'
 require 'goldiloader/association_options'
diff --git a/lib/goldiloader/active_record_patches.rb b/lib/goldiloader/active_record_patches.rb
index 986d39b..64e4cbc 100644
--- a/lib/goldiloader/active_record_patches.rb
+++ b/lib/goldiloader/active_record_patches.rb
@@ -25,6 +25,11 @@ def reload(*)
       @auto_include_context = nil
       super
     end
+
+    def goldiload(cache_name = nil, key: self.class.primary_key, &block)
+      cache_name ||= block.source_location.join(':')
+      auto_include_context.preloaded(self, cache_name: cache_name, key: key, &block)
+    end
   end
   ::ActiveRecord::Base.include(::Goldiloader::BasePatch)
 
diff --git a/lib/goldiloader/auto_include_context.rb b/lib/goldiloader/auto_include_context.rb
index 4513264..e30631f 100644
--- a/lib/goldiloader/auto_include_context.rb
+++ b/lib/goldiloader/auto_include_context.rb
@@ -51,5 +51,7 @@ def register_models(models)
     end
 
     alias_method :register_model, :register_models
+
+    prepend Goldiloader::CustomPreloads
   end
 end
diff --git a/lib/goldiloader/custom_preloads.rb b/lib/goldiloader/custom_preloads.rb
new file mode 100644
index 0000000..242e74d
--- /dev/null
+++ b/lib/goldiloader/custom_preloads.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Goldiloader
+  module CustomPreloads
+    def initialize
+      super
+      @custom_preloads = nil
+    end
+
+    def preloaded(model, cache_name:, key:, &block)
+      unless preloaded?(cache_name)
+        ids = models.map do |record|
+          record.public_send(key)
+        end
+
+        # We're using instance_exec instead of a simple yield to make sure that the
+        # given block does not have any references to the model instance as this might
+        # lead to unexpected results. The block will be executed in the context of the
+        # class of the model instead.
+        block_context = models.first.class
+        preloaded_hash = block_context.instance_exec(ids, &block)
+        store_preloaded(cache_name, preloaded_hash)
+      end
+      fetch_preloaded(cache_name, model, key: key)
+    end
+
+    private
+
+    def store_preloaded(cache_name, preloaded_hash)
+      @custom_preloads ||= {}
+      @custom_preloads[cache_name] = preloaded_hash
+    end
+
+    def fetch_preloaded(cache_name, instance, key:)
+      @custom_preloads&.dig(cache_name, instance.public_send(key))
+    end
+
+    def preloaded?(cache_name)
+      @custom_preloads&.key?(cache_name)
+    end
+  end
+end
diff --git a/spec/db/schema.rb b/spec/db/schema.rb
index 1da10b0..8d083b8 100644
--- a/spec/db/schema.rb
+++ b/spec/db/schema.rb
@@ -105,6 +105,32 @@ class Blog < ActiveRecord::Base
 
   has_one :post_with_order, -> { order(:id) }, class_name: 'Post'
 
+  def posts_count
+    goldiload do |ids|
+      Post.where(blog_id: ids).group(:blog_id).count
+    end
+  end
+
+  def tags_count
+    goldiload do |ids|
+      Tag
+        .joins(:posts)
+        .where(posts: { blog_id: ids })
+        .group(:blog_id)
+        .count
+    end
+  end
+
+  # rubocop:disable Style/RedundantSelf
+  def custom_preload_with_self_reference
+    goldiload do |ids|
+      ids.to_h do |id|
+        [id, self.posts.count]
+      end
+    end
+  end
+  # rubocop:enable Style/RedundantSelf
+
   def posts_overridden
     'boom'
   end
@@ -128,6 +154,18 @@ class Post < ActiveRecord::Base
 
   after_destroy :after_post_destroy
 
+  def author_global_id
+    author&.to_gid&.to_s
+  end
+
+  def author_via_global_id
+    goldiload key: :author_global_id do |gids|
+      GlobalID::Locator.locate_many(gids).index_by do |author|
+        author.to_gid.to_s
+      end
+    end
+  end
+
   def after_post_destroy
     # Hook for tests
   end
diff --git a/spec/goldiloader/goldiloader_spec.rb b/spec/goldiloader/goldiloader_spec.rb
index 87afeb5..7c7abe8 100644
--- a/spec/goldiloader/goldiloader_spec.rb
+++ b/spec/goldiloader/goldiloader_spec.rb
@@ -978,6 +978,81 @@
     end
   end
 
+  context "custom preloads" do
+    before do
+      # create some additional records to make sure we actually have different counts
+      blog1.posts.create!(title: 'another-post') do |post|
+        post.tags << Tag.create!(name: 'some tag')
+      end
+    end
+
+    let(:blogs) { Blog.order(:name).to_a }
+
+    it "returns custom preloads" do
+      expected_post_counts = blogs.map do |blog|
+        blog.posts.count
+      end
+
+      expected_tag_counts = blogs.map do |blog|
+        blog.posts.sum { |post| post.tags.count }
+      end
+
+      expect do
+        expect(blogs.map(&:posts_count)).to eq expected_post_counts
+        expect(blogs.map(&:tags_count)).to eq expected_tag_counts
+      end.to execute_queries(Post => 1, Tag => 1)
+    end
+
+    it "works without a collection" do
+      expect(blog1.posts_count).to eq blog1.posts.count
+      expect(blog2.posts_count).to eq blog2.posts.count
+    end
+
+    it "prevents self references to the model inside the block" do
+      expect do
+        blog1.custom_preload_with_self_reference
+      end.to raise_error(NoMethodError)
+    end
+
+    it "uses different caches for different blocks" do
+      result1 = blog1.goldiload do |ids|
+        ids.to_h { |id| [id, 42] }
+      end
+      expect(result1).to eq 42
+
+      result2 = blog1.goldiload do |ids|
+        ids.to_h { |id| [id, 666] }
+      end
+      expect(result2).to eq 666
+    end
+
+    it "can use an explicit cache_name" do
+      # Define explicit cache key :random_cache_key
+      blog1.goldiload(:random_cache_key) do |ids|
+        ids.to_h { |id| [id, 42] }
+      end
+
+      # Another blog for the same key
+      result = blog1.goldiload(:random_cache_key) do |ids|
+        # :nocov:
+        ids.to_h { |id| [id, 666] }
+        # :nocov:
+      end
+
+      # First block should be used
+      expect(result).to eq 42
+    end
+
+    it "can preload with a custom key" do
+      posts = Post.all.order(id: :asc)
+      expected_authors = posts.map(&:author)
+
+      expect do
+        expect(posts.map(&:author_via_global_id)).to eq expected_authors
+      end.to execute_queries(User => 1)
+    end
+  end
+
   describe "#globally_enabled" do
     context "enabled" do
       it "allows setting per thread" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 394e545..6fb3ba2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -39,7 +39,7 @@
 
     expected_counts_by_table = expected_counts.transform_keys(&:table_name)
 
-    table_extractor = /SELECT .* FROM "(.+)" WHERE/
+    table_extractor = /SELECT .* FROM "(\w+)" (WHERE|INNER JOIN)/
     actual_counts_by_table = @actual_queries.group_by do |query|
       table_extractor.match(query)[1]
     end.transform_values(&:size)

From ba502f8d726fe4b9e45f2926af45d9711ddac434 Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Sun, 5 Nov 2023 20:27:41 +0100
Subject: [PATCH 02/12] Update circleci config

---
 .circleci/config.yml | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7c3083d..f0eeedf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,18 +2,14 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: salsify/ruby_ci:2.6.10
+      - image: ruby:3.0.6
     working_directory: ~/goldiloader
     steps:
       - checkout
-      - run:
-          # This is only needed for Ruby 2.6.10 which has an old version of SQLite
-          name: Install SQLite
-          command: sudo apt-get update && sudo apt-get install -y libsqlite3-dev
       - restore_cache:
           keys:
-            - v1-gems-ruby-2.6.10-{{ checksum "goldiloader.gemspec" }}-{{ checksum "Gemfile" }}
-            - v1-gems-ruby-2.6.10-
+            - v1-gems-ruby-3.0.6-{{ checksum "goldiloader.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-3.0.6-
       - run:
           name: Install Gems
           command: |
@@ -22,7 +18,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v1-gems-ruby-2.6.10-{{ checksum "goldiloader.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-gems-ruby-3.0.6-{{ checksum "goldiloader.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -36,21 +32,13 @@ jobs:
       ruby_version:
         type: string
     docker:
-      - image: salsify/ruby_ci:<< parameters.ruby_version >>
+      - image: ruby:<< parameters.ruby_version >>
     environment:
       CIRCLE_TEST_REPORTS: "test-results"
       BUNDLE_GEMFILE: << parameters.gemfile >>
     working_directory: ~/goldiloader
     steps:
       - checkout
-      - when:
-          condition:
-            equal: [ "2.6.10", << parameters.ruby_version >> ]
-          steps:
-          - run:
-              # This is only needed for Ruby 2.6.10 which has an old version of SQLite
-              name: Install SQLite
-              command: sudo apt-get update && sudo apt-get install -y libsqlite3-dev
       - unless:
           condition:
             equal: ["gemfiles/rails_edge.gemfile", << parameters.gemfile >>]
@@ -126,4 +114,4 @@ workflows:
               gemfile:
                 - "gemfiles/rails_edge.gemfile"
               ruby_version:
-                - "3.2.0"
+                - "3.2.2"

From fccb83ac169ffb85e3225409c514556b11ff3378 Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Sun, 5 Nov 2023 20:32:47 +0100
Subject: [PATCH 03/12] Install sqlite for Ruby 2.6.10

---
 .circleci/config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0eeedf..82c923f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,10 @@ jobs:
     working_directory: ~/goldiloader
     steps:
       - checkout
+      - run:
+          # This is only needed for Ruby 2.6.10 which has an old version of SQLite
+          name: Install SQLite
+          command: sudo apt-get update && sudo apt-get install -y libsqlite3-dev
       - restore_cache:
           keys:
             - v1-gems-ruby-3.0.6-{{ checksum "goldiloader.gemspec" }}-{{ checksum "Gemfile" }}

From d84821d6234d4ddf3ca45a74273cbf9a297cb961 Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Sun, 5 Nov 2023 20:34:25 +0100
Subject: [PATCH 04/12] no sudo

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 82c923f..7abd86e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,7 @@ jobs:
       - run:
           # This is only needed for Ruby 2.6.10 which has an old version of SQLite
           name: Install SQLite
-          command: sudo apt-get update && sudo apt-get install -y libsqlite3-dev
+          command: apt-get update && apt-get install -y libsqlite3-dev
       - restore_cache:
           keys:
             - v1-gems-ruby-3.0.6-{{ checksum "goldiloader.gemspec" }}-{{ checksum "Gemfile" }}

From fe1240093aa365ffe5ae2eb06c1208d75804cf4e Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Sun, 5 Nov 2023 20:37:55 +0100
Subject: [PATCH 05/12] Ruby 2.6 requires older sqlite3

---
 goldiloader.gemspec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/goldiloader.gemspec b/goldiloader.gemspec
index f2dbc86..51aeab5 100644
--- a/goldiloader.gemspec
+++ b/goldiloader.gemspec
@@ -45,5 +45,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'salsify_rubocop', '~> 1.0.1'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'sqlite3'
+  if RUBY_VERSION < "2.7"
+    spec.add_development_dependency 'sqlite3', '1.6.7'
+  else
+    spec.add_development_dependency 'sqlite3'
+  end
 end

From 4cfa504d57ce917d171dc2140f096e7272d9c5c4 Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Sun, 5 Nov 2023 20:38:59 +0100
Subject: [PATCH 06/12] Add the actual older version

---
 goldiloader.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/goldiloader.gemspec b/goldiloader.gemspec
index 51aeab5..80750f1 100644
--- a/goldiloader.gemspec
+++ b/goldiloader.gemspec
@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'salsify_rubocop', '~> 1.0.1'
   spec.add_development_dependency 'simplecov'
   if RUBY_VERSION < "2.7"
-    spec.add_development_dependency 'sqlite3', '1.6.7'
+    spec.add_development_dependency 'sqlite3', '1.6.6'
   else
     spec.add_development_dependency 'sqlite3'
   end

From a2cf2581e34a55c13db61948cb4e4ab12119dbbd Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Sun, 5 Nov 2023 20:42:04 +0100
Subject: [PATCH 07/12] Fix sqlite3 version for ruby 2.6

---
 goldiloader.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/goldiloader.gemspec b/goldiloader.gemspec
index 80750f1..b534e8d 100644
--- a/goldiloader.gemspec
+++ b/goldiloader.gemspec
@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'salsify_rubocop', '~> 1.0.1'
   spec.add_development_dependency 'simplecov'
   if RUBY_VERSION < "2.7"
-    spec.add_development_dependency 'sqlite3', '1.6.6'
+    spec.add_development_dependency 'sqlite3', '1.5.4'
   else
     spec.add_development_dependency 'sqlite3'
   end

From 738d9d676daa6c0342308cf2d3007343e175fe29 Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Sun, 5 Nov 2023 20:56:46 +0100
Subject: [PATCH 08/12] Rubocop ++ do not use locate_many with older ruby
 version

---
 gemfiles/rails_5.2.gemfile | 2 ++
 gemfiles/rails_6.0.gemfile | 2 ++
 gemfiles/rails_6.1.gemfile | 2 ++
 goldiloader.gemspec        | 6 +-----
 spec/db/schema.rb          | 6 +++++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
index 490cc47..c345161 100644
--- a/gemfiles/rails_5.2.gemfile
+++ b/gemfiles/rails_5.2.gemfile
@@ -6,4 +6,6 @@ gem "activerecord", "5.2.8.1"
 gem "activesupport", "5.2.8.1"
 gem "rails", "5.2.8.1"
 
+gem "sqlite3", "1.5.4" if RUBY_VERSION < "2.7"
+
 gemspec path: "../"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
index 20a542e..84fdfc2 100644
--- a/gemfiles/rails_6.0.gemfile
+++ b/gemfiles/rails_6.0.gemfile
@@ -6,4 +6,6 @@ gem "activerecord", "6.0.6"
 gem "activesupport", "6.0.6"
 gem "rails", "6.0.6"
 
+gem "sqlite3", "1.5.4" if RUBY_VERSION < "2.7"
+
 gemspec path: "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
index 74fd766..8f99726 100644
--- a/gemfiles/rails_6.1.gemfile
+++ b/gemfiles/rails_6.1.gemfile
@@ -6,4 +6,6 @@ gem "activerecord", "6.1.7"
 gem "activesupport", "6.1.7"
 gem "rails", "6.1.7"
 
+gem "sqlite3", "1.5.4" if RUBY_VERSION < "2.7"
+
 gemspec path: "../"
diff --git a/goldiloader.gemspec b/goldiloader.gemspec
index b534e8d..f2dbc86 100644
--- a/goldiloader.gemspec
+++ b/goldiloader.gemspec
@@ -45,9 +45,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'salsify_rubocop', '~> 1.0.1'
   spec.add_development_dependency 'simplecov'
-  if RUBY_VERSION < "2.7"
-    spec.add_development_dependency 'sqlite3', '1.5.4'
-  else
-    spec.add_development_dependency 'sqlite3'
-  end
+  spec.add_development_dependency 'sqlite3'
 end
diff --git a/spec/db/schema.rb b/spec/db/schema.rb
index 8d083b8..6ffa024 100644
--- a/spec/db/schema.rb
+++ b/spec/db/schema.rb
@@ -160,7 +160,11 @@ def author_global_id
 
   def author_via_global_id
     goldiload key: :author_global_id do |gids|
-      GlobalID::Locator.locate_many(gids).index_by do |author|
+      user_ids = gids.compact.map {|gid|
+        GlobalID.parse(gid).model_id
+      }
+
+      User.where(id: user_ids).index_by do |author|
         author.to_gid.to_s
       end
     end

From 28e4f77ba2041770eede5b800cd9f0baaef39502 Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Sun, 5 Nov 2023 20:58:33 +0100
Subject: [PATCH 09/12] Rubocop

---
 spec/db/schema.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/db/schema.rb b/spec/db/schema.rb
index 6ffa024..d38ef41 100644
--- a/spec/db/schema.rb
+++ b/spec/db/schema.rb
@@ -160,9 +160,9 @@ def author_global_id
 
   def author_via_global_id
     goldiload key: :author_global_id do |gids|
-      user_ids = gids.compact.map {|gid|
+      user_ids = gids.compact.map do |gid|
         GlobalID.parse(gid).model_id
-      }
+      end
 
       User.where(id: user_ids).index_by do |author|
         author.to_gid.to_s

From 29b6761e13d0cef1e55d5298cee35aa1bbf97d1c Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Thu, 9 Nov 2023 21:03:15 +0100
Subject: [PATCH 10/12] Use ruby 2.6.10 image

---
 .circleci/config.yml | 8 ++++----
 Appraisals           | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7abd86e..e16cd7f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: ruby:3.0.6
+      - image: ruby:2.6.10
     working_directory: ~/goldiloader
     steps:
       - checkout
@@ -12,8 +12,8 @@ jobs:
           command: apt-get update && apt-get install -y libsqlite3-dev
       - restore_cache:
           keys:
-            - v1-gems-ruby-3.0.6-{{ checksum "goldiloader.gemspec" }}-{{ checksum "Gemfile" }}
-            - v1-gems-ruby-3.0.6-
+            - v1-gems-ruby-2.6.10-{{ checksum "goldiloader.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-2.6.10-
       - run:
           name: Install Gems
           command: |
@@ -22,7 +22,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v1-gems-ruby-3.0.6-{{ checksum "goldiloader.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-gems-ruby-2.6.10-{{ checksum "goldiloader.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
diff --git a/Appraisals b/Appraisals
index 043a3e4..a1cf175 100644
--- a/Appraisals
+++ b/Appraisals
@@ -4,6 +4,7 @@ appraise 'rails-5.2' do
   gem 'activerecord', '5.2.8.1'
   gem 'activesupport', '5.2.8.1'
   gem 'rails', '5.2.8.1'
+  gem "sqlite3", "1.5.4" if RUBY_VERSION < "2.7"
 end
 
 appraise 'rails-6.0' do

From 13f5df3d72abc900a40a2c8ba37e110d933d9c67 Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Thu, 9 Nov 2023 21:13:20 +0100
Subject: [PATCH 11/12] Appraisals

---
 Appraisals                  | 21 ++++++++++++++++++++-
 gemfiles/rails_5.2.gemfile  |  4 +++-
 gemfiles/rails_6.0.gemfile  |  4 +++-
 gemfiles/rails_6.1.gemfile  |  4 +++-
 gemfiles/rails_7.0.gemfile  |  4 ++++
 gemfiles/rails_edge.gemfile |  4 ++++
 6 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/Appraisals b/Appraisals
index a1cf175..7efbc64 100644
--- a/Appraisals
+++ b/Appraisals
@@ -4,29 +4,48 @@ appraise 'rails-5.2' do
   gem 'activerecord', '5.2.8.1'
   gem 'activesupport', '5.2.8.1'
   gem 'rails', '5.2.8.1'
-  gem "sqlite3", "1.5.4" if RUBY_VERSION < "2.7"
+
+  install_if "-> { RUBY_VERSION < '2.7' }" do
+    gem 'sqlite3', '1.5.4'
+  end
 end
 
 appraise 'rails-6.0' do
   gem 'activerecord', '6.0.6'
   gem 'activesupport', '6.0.6'
   gem 'rails', '6.0.6'
+
+  install_if "-> { RUBY_VERSION < '2.7' }" do
+    gem 'sqlite3', '1.5.4'
+  end
 end
 
 appraise 'rails-6.1' do
   gem 'activerecord', '6.1.7'
   gem 'activesupport', '6.1.7'
   gem 'rails', '6.1.7'
+
+  install_if "-> { RUBY_VERSION < '2.7' }" do
+    gem 'sqlite3', '1.5.4'
+  end
 end
 
 appraise 'rails-7.0' do
   gem 'activerecord', '7.0.4'
   gem 'activesupport', '7.0.4'
   gem 'rails', '7.0.4'
+
+  install_if "-> { RUBY_VERSION < '2.7' }" do
+    gem 'sqlite3', '1.5.4'
+  end
 end
 
 appraise 'rails-edge' do
   gem 'activerecord', github: 'rails/rails', branch: 'main'
   gem 'activesupport', github: 'rails/rails', branch: 'main'
   gem 'rails', github: 'rails/rails', branch: 'main'
+
+  install_if "-> { RUBY_VERSION < '2.7' }" do
+    gem 'sqlite3', '1.5.4'
+  end
 end
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
index c345161..9251c7b 100644
--- a/gemfiles/rails_5.2.gemfile
+++ b/gemfiles/rails_5.2.gemfile
@@ -6,6 +6,8 @@ gem "activerecord", "5.2.8.1"
 gem "activesupport", "5.2.8.1"
 gem "rails", "5.2.8.1"
 
-gem "sqlite3", "1.5.4" if RUBY_VERSION < "2.7"
+install_if -> { RUBY_VERSION < '2.7' } do
+  gem "sqlite3", "1.5.4"
+end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
index 84fdfc2..ba61af0 100644
--- a/gemfiles/rails_6.0.gemfile
+++ b/gemfiles/rails_6.0.gemfile
@@ -6,6 +6,8 @@ gem "activerecord", "6.0.6"
 gem "activesupport", "6.0.6"
 gem "rails", "6.0.6"
 
-gem "sqlite3", "1.5.4" if RUBY_VERSION < "2.7"
+install_if -> { RUBY_VERSION < '2.7' } do
+  gem "sqlite3", "1.5.4"
+end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
index 8f99726..7bc3ac7 100644
--- a/gemfiles/rails_6.1.gemfile
+++ b/gemfiles/rails_6.1.gemfile
@@ -6,6 +6,8 @@ gem "activerecord", "6.1.7"
 gem "activesupport", "6.1.7"
 gem "rails", "6.1.7"
 
-gem "sqlite3", "1.5.4" if RUBY_VERSION < "2.7"
+install_if -> { RUBY_VERSION < '2.7' } do
+  gem "sqlite3", "1.5.4"
+end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
index 06e2a72..590ce68 100644
--- a/gemfiles/rails_7.0.gemfile
+++ b/gemfiles/rails_7.0.gemfile
@@ -6,4 +6,8 @@ gem "activerecord", "7.0.4"
 gem "activesupport", "7.0.4"
 gem "rails", "7.0.4"
 
+install_if -> { RUBY_VERSION < '2.7' } do
+  gem "sqlite3", "1.5.4"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
index f578954..5413219 100644
--- a/gemfiles/rails_edge.gemfile
+++ b/gemfiles/rails_edge.gemfile
@@ -6,4 +6,8 @@ gem "activerecord", branch: "main", git: "https://github.com/rails/rails.git"
 gem "activesupport", branch: "main", git: "https://github.com/rails/rails.git"
 gem "rails", branch: "main", git: "https://github.com/rails/rails.git"
 
+install_if -> { RUBY_VERSION < '2.7' } do
+  gem "sqlite3", "1.5.4"
+end
+
 gemspec path: "../"

From ed537e14a332b8f2dfdf3ac930f54ab9d30ef966 Mon Sep 17 00:00:00 2001
From: Alexander Pauly <alexander.pauly@i22.de>
Date: Thu, 9 Nov 2023 21:24:46 +0100
Subject: [PATCH 12/12] WIP

---
 Appraisals                  | 16 ----------------
 gemfiles/rails_6.0.gemfile  |  4 ----
 gemfiles/rails_6.1.gemfile  |  4 ----
 gemfiles/rails_7.0.gemfile  |  4 ----
 gemfiles/rails_edge.gemfile |  4 ----
 5 files changed, 32 deletions(-)

diff --git a/Appraisals b/Appraisals
index 7efbc64..b58760e 100644
--- a/Appraisals
+++ b/Appraisals
@@ -14,38 +14,22 @@ appraise 'rails-6.0' do
   gem 'activerecord', '6.0.6'
   gem 'activesupport', '6.0.6'
   gem 'rails', '6.0.6'
-
-  install_if "-> { RUBY_VERSION < '2.7' }" do
-    gem 'sqlite3', '1.5.4'
-  end
 end
 
 appraise 'rails-6.1' do
   gem 'activerecord', '6.1.7'
   gem 'activesupport', '6.1.7'
   gem 'rails', '6.1.7'
-
-  install_if "-> { RUBY_VERSION < '2.7' }" do
-    gem 'sqlite3', '1.5.4'
-  end
 end
 
 appraise 'rails-7.0' do
   gem 'activerecord', '7.0.4'
   gem 'activesupport', '7.0.4'
   gem 'rails', '7.0.4'
-
-  install_if "-> { RUBY_VERSION < '2.7' }" do
-    gem 'sqlite3', '1.5.4'
-  end
 end
 
 appraise 'rails-edge' do
   gem 'activerecord', github: 'rails/rails', branch: 'main'
   gem 'activesupport', github: 'rails/rails', branch: 'main'
   gem 'rails', github: 'rails/rails', branch: 'main'
-
-  install_if "-> { RUBY_VERSION < '2.7' }" do
-    gem 'sqlite3', '1.5.4'
-  end
 end
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
index ba61af0..20a542e 100644
--- a/gemfiles/rails_6.0.gemfile
+++ b/gemfiles/rails_6.0.gemfile
@@ -6,8 +6,4 @@ gem "activerecord", "6.0.6"
 gem "activesupport", "6.0.6"
 gem "rails", "6.0.6"
 
-install_if -> { RUBY_VERSION < '2.7' } do
-  gem "sqlite3", "1.5.4"
-end
-
 gemspec path: "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
index 7bc3ac7..74fd766 100644
--- a/gemfiles/rails_6.1.gemfile
+++ b/gemfiles/rails_6.1.gemfile
@@ -6,8 +6,4 @@ gem "activerecord", "6.1.7"
 gem "activesupport", "6.1.7"
 gem "rails", "6.1.7"
 
-install_if -> { RUBY_VERSION < '2.7' } do
-  gem "sqlite3", "1.5.4"
-end
-
 gemspec path: "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
index 590ce68..06e2a72 100644
--- a/gemfiles/rails_7.0.gemfile
+++ b/gemfiles/rails_7.0.gemfile
@@ -6,8 +6,4 @@ gem "activerecord", "7.0.4"
 gem "activesupport", "7.0.4"
 gem "rails", "7.0.4"
 
-install_if -> { RUBY_VERSION < '2.7' } do
-  gem "sqlite3", "1.5.4"
-end
-
 gemspec path: "../"
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
index 5413219..f578954 100644
--- a/gemfiles/rails_edge.gemfile
+++ b/gemfiles/rails_edge.gemfile
@@ -6,8 +6,4 @@ gem "activerecord", branch: "main", git: "https://github.com/rails/rails.git"
 gem "activesupport", branch: "main", git: "https://github.com/rails/rails.git"
 gem "rails", branch: "main", git: "https://github.com/rails/rails.git"
 
-install_if -> { RUBY_VERSION < '2.7' } do
-  gem "sqlite3", "1.5.4"
-end
-
 gemspec path: "../"