Permalink
Browse files

remove orig

  • Loading branch information...
1 parent 65ec62d commit c4ad250c1c99a89298803f8df1741b923ad97931 @tobi committed Mar 21, 2010
Showing with 0 additions and 45 deletions.
  1. +0 −44 lib/after_commit.rb.orig
  2. +0 −1 lib/after_commit/callback.rb
View
@@ -1,44 +0,0 @@
-module AfterCommit
-
- def self.add(connection, record)
- Thread.current[:committed_records] ||= {}
- Thread.current[:committed_records][connection.unique_transaction_key] ||= Set.new
- Thread.current[:committed_records][connection.unique_transaction_key] << record
- end
-
- def self.records(connection)
- Thread.current[:committed_records] ||= {}
- Thread.current[:committed_records][connection.old_transaction_key] ||= Set.new
- end
-
- def self.cleanup(connection)
- Thread.current[:committed_records] ||= {}
- Thread.current[:committed_records].delete(connection.old_transaction_key)
-<<<<<<< HEAD
- end
-
- def self.prepare_collection(collection, connection)
- Thread.current[collection] ||= {}
- Thread.current[collection][connection.unique_transaction_key] ||= []
- end
-
- def self.add_to_collection(collection, connection, record)
- Thread.current[collection][connection.unique_transaction_key] << record
- end
-
- def self.collection(collection, connection)
- Thread.current[collection] ||= {}
- Thread.current[collection][connection.old_transaction_key] ||= []
- end
-=======
- end
->>>>>>> master
-end
-
-require 'active_record'
-require 'after_commit/callback'
-require 'after_commit/connection_adapters'
-require 'after_commit/test_bypass'
-
-ActiveRecord::Base.send(:include, AfterCommit::Callback)
-ActiveRecord::Base.connection.class.send(:include, AfterCommit::ConnectionAdapters)
@@ -8,7 +8,6 @@ def self.included(base)
def mark_record_for_after_commit
AfterCommit.add(self.class.connection, self)
- true
end
end

0 comments on commit c4ad250

Please sign in to comment.