3.2.19.github7

It looks like these methods all get included into the AbstractAdapter,
and then in github/github we have our own Adapter as an internal gem.

So this should be easy enough to override in our vendor'ed adapter.

This will allow us to still grab errors that happen in `after_commit`
which would normally be swallowed in Rails 3.0 (and beyond).

Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

RAILS_VERSION

@@ -1 +1 @@
-3.2.19.github4
+3.2.19.github7

actionpack/lib/action_view/helpers/cache_helper.rb

@@ -2,11 +2,11 @@ module ActionView
   # = Action View Cache Helper
   module Helpers
     module CacheHelper
-      # This helper exposes a method for caching fragments of a view 
+      # This helper exposes a method for caching fragments of a view
       # rather than an entire action or page. This technique is useful
       # caching pieces like menus, lists of newstopics, static HTML
       # fragments, and so on. This method takes a block that contains
-      # the content you wish to cache. 
+      # the content you wish to cache.
       #
       # See ActionController::Caching::Fragments for usage instructions.
       #
@@ -23,7 +23,7 @@ module ActionView
       #      <p>Hello users!  Welcome to our website!</p>
       #   <% end %>
       #
-      # Static content with embedded ruby content can be cached as 
+      # Static content with embedded ruby content can be cached as
       # well:
       #
       #    <% cache do %>
@@ -49,10 +49,11 @@ module ActionView
         else
           # VIEW TODO: Make #capture usable outside of ERB
           # This dance is needed because Builder can't use capture
-          pos = output_buffer.length
+          pos = output_buffer.bytesize
           yield
           output_safe = output_buffer.html_safe?
-          fragment = output_buffer.slice!(pos..-1)
+          fragment = output_buffer.byteslice(pos..-1)
+          self.output_buffer = output_buffer.byteslice(0...pos)
           if output_safe
             self.output_buffer = output_buffer.class.new(output_buffer)
           end

activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

@@ -371,7 +371,7 @@ module ActiveRecord
               begin
                 record.committed!
               rescue Exception => e
-                record.logger.error(e) if record.respond_to?(:logger) && record.logger
+                handle_commit_exceptions(record, e)
               end
             end
           end
@@ -385,6 +385,11 @@ module ActiveRecord
         row = result.rows.first
         row && row.first
       end
+
+      # Handle any exceptions caught trying to send the commit message to a record
+      def handle_commit_exceptions(record, e)
+        record.logger.error(e) if record.respond_to?(:logger) && record.logger
+      end
     end
   end
 end

activerecord/lib/active_record/transactions.rb

@@ -278,7 +278,7 @@ module ActiveRecord
 
     # Call the after_commit callbacks
     def committed! #:nodoc:
-      run_callbacks :commit
+      run_callbacks :commit if destroyed? || persisted?
     ensure
       @_start_transaction_state.clear
     end