activerecord-import 0.2.10 → 0.2.11

data/Rakefile

@@ -36,7 +36,7 @@ namespace :display do
 end
 task :default => ["display:notice"]
 
-ADAPTERS = %w(mysql mysql2 jdbcmysql postgresql sqlite3)
+ADAPTERS = %w(mysql mysql2 jdbcmysql postgresql sqlite3 seamless_database_pool)
 ADAPTERS.each do |adapter|
   namespace :test do
     desc "Runs #{adapter} database tests."

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb

@@ -2,5 +2,5 @@ require "active_record/connection_adapters/mysql_adapter"
 require "activerecord-import/adapters/mysql_adapter"
 
 class ActiveRecord::ConnectionAdapters::MysqlAdapter
-  include ActiveRecord::Import::MysqlAdapter::InstanceMethods
+  include ActiveRecord::Import::MysqlAdapter
 end

data/lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb

@@ -0,0 +1,7 @@
+require "seamless_database_pool"
+require "active_record/connection_adapters/seamless_database_pool_adapter"
+require "activerecord-import/adapters/mysql_adapter"
+
+class ActiveRecord::ConnectionAdapters::SeamlessDatabasePoolAdapter
+  include ActiveRecord::Import::MysqlAdapter
+end

data/lib/activerecord-import/import.rb

@@ -17,6 +17,12 @@ module ActiveRecord::Import #:nodoc:
       true
     end
   end
+
+  class MissingColumnError < StandardError
+    def initialize(name, index)
+      super "Missing column for value <#{name}> at index #{index}"
+    end
+  end
 end
 
 class ActiveRecord::Base
@@ -254,8 +260,12 @@ class ActiveRecord::Base
         end    
       end
       array_of_attributes.compact!
-      
-      num_inserts = array_of_attributes.empty? ? 0 : import_without_validations_or_callbacks( column_names, array_of_attributes, options )
+
+      num_inserts = if array_of_attributes.empty? || options[:all_or_none] && failed_instances.any?
+                      0
+                    else
+                      import_without_validations_or_callbacks( column_names, array_of_attributes, options )
+                    end
       ActiveRecord::Import::Result.new(failed_instances, num_inserts)
     end
     
@@ -266,7 +276,13 @@ class ActiveRecord::Base
     # information on +column_names+, +array_of_attributes_ and
     # +options+.
     def import_without_validations_or_callbacks( column_names, array_of_attributes, options={} )
-      columns = column_names.map { |name| columns_hash[name.to_s] }
+      columns = column_names.each_with_index.map do |name, i|
+        column = columns_hash[name.to_s]
+
+        raise ActiveRecord::Import::MissingColumnError.new(name.to_s, i) if column.nil?
+
+        column
+      end
 
       columns_sql = "(#{column_names.map{|name| connection.quote_column_name(name) }.join(',')})"
       insert_sql = "INSERT #{options[:ignore] ? 'IGNORE ':''}INTO #{quoted_table_name} #{columns_sql} VALUES "
@@ -297,6 +313,7 @@ class ActiveRecord::Base
       array_of_attributes.map do |arr|
         my_values = arr.each_with_index.map do |val,j|
           column = columns[j]
+
           if val.nil? && !sequence_name.blank? && column.name == primary_key
              connection.next_value_for_sequence(sequence_name)
           else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -92,6 +92,7 @@ files:
 - lib/activerecord-import/active_record/adapters/mysql2_adapter.rb
 - lib/activerecord-import/active_record/adapters/mysql_adapter.rb
 - lib/activerecord-import/active_record/adapters/postgresql_adapter.rb
+- lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb
 - lib/activerecord-import/active_record/adapters/sqlite3_adapter.rb
 - lib/activerecord-import/adapters/abstract_adapter.rb
 - lib/activerecord-import/adapters/mysql_adapter.rb
@@ -118,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4211512731730455509
+      hash: 4132545664813996444
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: