Propagate :retryable on composite collector to children

activerecord/lib/arel/collectors/bind.rb

@@ -3,6 +3,8 @@
 module Arel # :nodoc: all
   module Collectors
     class Bind
+      attr_accessor :retryable
+
       def initialize
         @binds = []
       end

activerecord/lib/arel/collectors/composite.rb

@@ -3,13 +3,20 @@
 module Arel # :nodoc: all
   module Collectors
     class Composite
-      attr_accessor :preparable, :retryable
+      attr_accessor :preparable
+      attr_reader :retryable
 
       def initialize(left, right)
         @left = left
         @right = right
       end
 
+      def retryable=(retryable)
+        left.retryable = retryable
+        right.retryable = retryable
+        @retryable = retryable
+      end
+
       def <<(str)
         left << str
         right << str

activerecord/test/cases/arel/collectors/composite_test.rb

@@ -42,6 +42,16 @@ def test_composite_collector_performs_multiple_collections_at_once
         assert_equal 'SELECT FROM "users" WHERE "users"."age" = ? AND "users"."name" = ?', sql
         assert_equal ["hello2", "world3"], binds
       end
+
+      def test_retryable_on_composite_collector_propagates
+        sql_collector = Collectors::SQLString.new
+        bind_collector = Collectors::Bind.new
+        collector = Collectors::Composite.new(sql_collector, bind_collector)
+        collector.retryable = true
+
+        assert sql_collector.retryable
+        assert bind_collector.retryable
+      end
     end
   end
 end