Empact-activerecord-import 0.4.1 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.3

data/lib/activerecord-import/adapters/mysql_adapter.rb

@@ -5,10 +5,12 @@ module ActiveRecord::Import::MysqlAdapter
   # Returns the maximum number of bytes that the server will allow
   # in a single packet
   def max_allowed_packet # :nodoc:
-    result = execute( "SHOW VARIABLES like 'max_allowed_packet';" )
-    # original Mysql gem responds to #fetch_row while Mysql2 responds to #first
-    val = result.respond_to?(:fetch_row) ? result.fetch_row[1] : result.first[1]
-    val.to_i
+    @max_allowed_packet ||= begin
+      result = execute( "SHOW VARIABLES like 'max_allowed_packet';" )
+      # original Mysql gem responds to #fetch_row while Mysql2 responds to #first
+      val = result.respond_to?(:fetch_row) ? result.fetch_row[1] : result.first[1]
+      val.to_i
+    end
   end
 
   # Returns a generated ON DUPLICATE KEY UPDATE statement given the passed

data/lib/activerecord-import/import.rb

@@ -160,8 +160,13 @@ class ActiveRecord::Base
 
       is_validating = options.delete( :validate )
 
+      if !args.last.is_a?( Array )
+        raise ArgumentError, '.import expects one or two Array arguments'
+      # supports empty array
+      elsif args.last.empty?
+        return ActiveRecord::Import::Result.new([], 0)
       # assume array of model objects
-      if args.last.is_a?( Array ) and args.last.first.is_a? ActiveRecord::Base
+      elsif args.last.first.is_a? ActiveRecord::Base
         models = args.pop
         column_names = args.first || self.column_names.dup
 
@@ -173,19 +178,16 @@ class ActiveRecord::Base
             end
           # end
         end
-        # supports empty array
-      elsif args.last.is_a?( Array ) and args.last.empty?
-        return ActiveRecord::Import::Result.new([], 0) if args.last.empty?
-        # supports 2-element array and array
-      elsif args.size == 2 and args.first.is_a?( Array ) and args.last.is_a?( Array )
+      # supports 2-element array and array
+      elsif args.size == 2 and args.first.is_a?( Array )
         column_names, array_of_attributes = args
+
+        # dup the passed in array so we don't modify it unintentionally
+        array_of_attributes = array_of_attributes.dup
       else
-        raise ArgumentError.new( "Invalid arguments!" )
+        raise ArgumentError
       end
 
-      # dup the passed in array so we don't modify it unintentionally
-      array_of_attributes = array_of_attributes.dup
-
       # Force the primary key col into the insert if it's not
       # on the list and we are using a sequence and stuff a nil
       # value for it into each row so the sequencer will fire later
@@ -199,12 +201,13 @@ class ActiveRecord::Base
          add_special_rails_stamps column_names, array_of_attributes, options
       end
 
-      return_obj = if is_validating
-        import_with_validations( column_names, array_of_attributes, options )
-      else
-        num_inserts = import_without_validations_or_callbacks( column_names, array_of_attributes, options )
-        ActiveRecord::Import::Result.new([], num_inserts)
-      end
+      return_obj =
+        if is_validating
+          import_with_validations( column_names, array_of_attributes, options )
+        else
+          num_inserts = import_without_validations_or_callbacks( column_names, array_of_attributes, options )
+          ActiveRecord::Import::Result.new([], num_inserts)
+        end
 
       if options[:synchronize]
         sync_keys = options[:synchronize_keys] || [self.primary_key]
@@ -239,7 +242,7 @@ class ActiveRecord::Base
         instance = new do |model|
           hsh.each_pair{ |k,v| model.send("#{k}=", v) }
         end
-        if not instance.valid?
+        if !instance.valid?
           array_of_attributes[ i ] = nil
           failed_instances << instance
         end

data/lib/activerecord-import/synchronize.rb

@@ -33,7 +33,7 @@ module ActiveRecord # :nodoc:
 
       klass = instances.first.class
 
-      fresh_instances = klass.find( :all, :conditions=>conditions, :order=>order )
+      fresh_instances = klass.where(conditions).order(order).all
       instances.each do |instance|
         matched_instance = fresh_instances.detect do |fresh_instance|
           keys.all?{ |key| fresh_instance.send(key) == instance.send(key) }
@@ -42,7 +42,9 @@ module ActiveRecord # :nodoc:
         if matched_instance
           instance.clear_aggregation_cache
           instance.clear_association_cache
-          instance.instance_variable_set '@attributes', matched_instance.attributes
+          instance.instance_variable_get('@attributes').update(matched_instance.instance_variable_get('@attributes'))
+          instance.instance_variable_set('@columns_hash', matched_instance.instance_variable_get('@columns_hash'))
+          instance.instance_variable_set('@attributes_cache', {})
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Empact-activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70139591717760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70139591717760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70139591717020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70139591717020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70139591715840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70139591715840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 description: Extraction of the ActiveRecord::Base#import functionality from ar-extensions
   for Rails 3 and beyond
 email: ben.woosley@gmail.com
@@ -84,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2510972536084557181
+      hash: -3863858438145436017
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Bulk-loading extension for ActiveRecord