activerecord-import 0.3.0 → 0.3.1

data/README.markdown

@@ -2,6 +2,16 @@
 
 activerecord-import is a library for bulk inserting data using ActiveRecord. 
 
+### Rails 3.1.x and higher
+
+Use the latest activerecord-import.
+
+### Rails 3.0.x up to, but not including 3.1
+
+Use activerecord-import 0.2.11. As of activerecord-import 0.3.0 we are relying on functionality that was introduced in Rails 3.1. Since Rails 3.0.x is no longer a supported version of Rails we have decided to drop support as well.
+
+### For More Information
+
 For more information on activerecord-import please see its wiki: https://github.com/zdennis/activerecord-import/wiki
 
 # License

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

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

@@ -8,7 +8,7 @@ module ActiveRecord::Import::AbstractAdapter
       arr, current_arr_values_size, current_size = [], 0, 0
       values.each_with_index do |val,i|
         comma_bytes = arr.size
-        sql_size_thus_far = sql_size + current_size + val.size + comma_bytes
+        sql_size_thus_far = sql_size + current_size + val.bytesize + comma_bytes
         if NO_MAX_PACKET == max_bytes or sql_size_thus_far <= max_bytes
           current_size += val.bytesize            
           arr << val

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

@@ -1,4 +1,18 @@
 module ActiveRecord::Import::SQLite3Adapter
+  include ActiveRecord::Import::ImportSupport
+
+  # Override our conformance to ActiveRecord::Import::ImportSupport interface
+  # to ensure that we only support import in supported version of SQLite.
+  # Which INSERT statements with multiple value sets was introduced in 3.2.11.
+  def supports_import?(current_version=self.sqlite_version)
+    minimum_supported_version = "3.2.11"
+    if current_version >= minimum_supported_version
+      true
+    else
+      false
+    end
+  end
+
   def next_value_for_sequence(sequence_name)
     %{nextval('#{sequence_name}')}
   end

data/lib/activerecord-import/import.rb

@@ -43,8 +43,8 @@ class ActiveRecord::Base
   
     # Returns true if the current database connection adapter
     # supports import functionality, otherwise returns false.
-    def supports_import?
-      connection.supports_import?
+    def supports_import?(*args)
+      connection.supports_import?(*args)
     rescue NoMethodError
       false
     end
@@ -205,7 +205,7 @@ class ActiveRecord::Base
       # 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
-      if !column_names.include?(primary_key) && sequence_name && connection.prefetch_primary_key?
+      if !column_names.include?(primary_key) && connection.prefetch_primary_key? && sequence_name
          column_names << primary_key
          array_of_attributes.each { |a| a << nil }
       end
@@ -276,11 +276,15 @@ class ActiveRecord::Base
     # information on +column_names+, +array_of_attributes_ and
     # +options+.
     def import_without_validations_or_callbacks( column_names, array_of_attributes, options={} )
+      column_names = column_names.map(&:to_sym)
       scope_columns, scope_values = scope_attributes.to_a.transpose
 
       unless scope_columns.blank?
-        column_names.concat scope_columns
-        array_of_attributes.each { |a| a.concat scope_values }
+        scope_columns.zip(scope_values).each do |name, value|
+          next if column_names.include?(name.to_sym)
+          column_names << name
+          array_of_attributes.each { |attrs| attrs << value }
+        end
       end
 
       columns = column_names.each_with_index.map do |name, i|
@@ -303,7 +307,7 @@ class ActiveRecord::Base
       else
         # generate the sql
         post_sql_statements = connection.post_sql_statements( quoted_table_name, options )
-        
+
         # perform the inserts
         number_inserted = connection.insert_many( [ insert_sql, post_sql_statements ].flatten, 
                                                   values_sql,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2739522167439917244
+      hash: -1608822567820744483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: