1 files changed, 12 insertions, 0 deletions
diff --git a/lib/active_storage/attached/macros.rb b/lib/active_storage/attached/macros.rb
index 1e0f9a6b7e..5915793f8a 100644
--- a/lib/active_storage/attached/macros.rb
+++ b/lib/active_storage/attached/macros.rb
@@ -16,6 +16,9 @@ module ActiveStorage::Attached::Macros
         instance_variable_set("@active_storage_attached_#{name}", ActiveStorage::Attached::One.new(name, self))
     end
 
+    has_one :"#{name}_attachment", -> { where(name: name) }, class_name: "ActiveStorage::Attachment", as: :record
+    has_one :"#{name}_blob", through: :"#{name}_attachment"
+
     if dependent == :purge_later
       before_destroy { public_send(name).purge_later }
     end
@@ -30,6 +33,10 @@ module ActiveStorage::Attached::Macros
   # There are no columns defined on the model side, Active Storage takes
   # care of the mapping between your records and the attachments.
   #
+  # To avoid N+1 queries, you can include the attached blobs in your query like so:
+  #
+  #   Gallery.where(user: Current.user).with_attached_photos
+  #
   # If the +:dependent+ option isn't set, all the attachments will be purged
   # (i.e. destroyed) whenever the record is destroyed.
   def has_many_attached(name, dependent: :purge_later)
@@ -38,6 +45,11 @@ module ActiveStorage::Attached::Macros
         instance_variable_set("@active_storage_attached_#{name}", ActiveStorage::Attached::Many.new(name, self))
     end
 
+    has_many :"#{name}_attachments", -> { where(name: name) }, as: :record, class_name: "ActiveStorage::Attachment"
+    has_many :"#{name}_blobs", through: :"#{name}_attachments"
+
+    scope :"with_attached_#{name}", -> { includes("#{name}_attachments": :blob) }
+
     if dependent == :purge_later
       before_destroy { public_send(name).purge_later }
     end