copious-activerecord-activesalesforce-adapter 2.2.3 → 2.2.4

data/lib/active_record/connection_adapters/activesalesforce_adapter.rb

@@ -131,7 +131,7 @@ module ActiveRecord
         @entity_def_map = {}
         @keyprefix_to_entity_def_map = {}
         
-        @command_boxcar = []
+        @command_boxcar = nil
         @class_to_entity_map = {}
       end
       
@@ -250,6 +250,9 @@ module ActiveRecord
 	        previous_command = command
           end
         end
+
+        # Discard the command boxcar
+        @command_boxcar = nil
         
         # Finish off the partial boxcar
         send_commands(commands) unless commands.empty?
@@ -260,7 +263,7 @@ module ActiveRecord
       # done if the transaction block raises an exception or returns false.
       def rollback_db_transaction() 
         log('Rolling back boxcar', 'rollback_db_transaction()')
-        @command_boxcar = []
+        @command_boxcar = nil
       end
       
       
@@ -398,7 +401,7 @@ module ActiveRecord
           
           # Track the id to be able to update it when the create() is actually executed
           id = String.new
-          @command_boxcar << ActiveSalesforce::BoxcarCommand::Insert.new(self, sobject, id)
+          queue_command ActiveSalesforce::BoxcarCommand::Insert.new(self, sobject, id)
           
           id
         }
@@ -426,7 +429,7 @@ module ActiveRecord
           
           sobject = create_sobject(entity_def.api_name, id, fields, null_fields)
           
-          @command_boxcar << ActiveSalesforce::BoxcarCommand::Update.new(self, sobject)
+          queue_command ActiveSalesforce::BoxcarCommand::Update.new(self, sobject)
         #}
       end
       
@@ -447,7 +450,7 @@ module ActiveRecord
           ids_element = []        
           ids.each { |id| ids_element << :ids << id }
           
-          @command_boxcar << ActiveSalesforce::BoxcarCommand::Delete.new(self, ids_element)
+          queue_command ActiveSalesforce::BoxcarCommand::Delete.new(self, ids_element)
         }
       end
       
@@ -777,6 +780,21 @@ module ActiveRecord
       def debug(msg)
         @logger.debug(msg) if @logger
       end
+
+      protected
+
+      def queue_command(command)
+        # If @command_boxcar is not nil, then this is a transaction
+        # and commands should be queued in the boxcar
+        if @command_boxcar
+          @command_boxcar << command
+
+        # If a command is not executed within a transaction, it should
+        # be executed immediately
+        else
+          send_commands([command])
+        end
+      end
       
     end
     

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: copious-activerecord-activesalesforce-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors: 
 - Doug Chasman
 - Luigi Montanez
 - Senthil Nayagam
 - Justin Ball
+- Jesse Hallett
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 -08:00
+date: 2008-12-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,6 +24,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.0.2
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "2.2"
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -78,9 +82,9 @@ files:
 - test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact.recording
 - test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact_by_first_name.recording
 - README
-has_rdoc: false
+has_rdoc: true
 homepage: http://activesfdc.rubyforge.org/
-post_install_message: "this version is compatible with Rails 2.2,\n  please report any bug in the group\n  http://groups.google.com/group/activesalesforce\n  "
+post_install_message: "this version is compatible with Rails 2.1,\n  please report any bug in the group\n  http://groups.google.com/group/activesalesforce\n  "
 rdoc_options: []
 
 require_paths: