activerecord-import 0.2.11 → 0.3.0

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.3.0

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

@@ -1,6 +1,6 @@
 require "active_record/connection_adapters/mysql2_adapter"
-require "activerecord-import/adapters/mysql_adapter"
+require "activerecord-import/adapters/mysql2_adapter"
 
 class ActiveRecord::ConnectionAdapters::Mysql2Adapter
-  include ActiveRecord::Import::MysqlAdapter
+  include ActiveRecord::Import::Mysql2Adapter
 end

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

@@ -1,7 +1,7 @@
 require "active_record/connection_adapters/sqlite3_adapter"
 require "activerecord-import/adapters/sqlite3_adapter"
 
-class ActiveRecord::ConnectionAdapters::Sqlite3Adapter
-  include ActiveRecord::Import::Sqlite3Adapter
+class ActiveRecord::ConnectionAdapters::SQLite3Adapter
+  include ActiveRecord::Import::SQLite3Adapter
 end
 

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

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + "/mysql_adapter"
+
+module ActiveRecord::Import::Mysql2Adapter
+  include ActiveRecord::Import::MysqlAdapter
+end

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

@@ -1,4 +1,4 @@
-module ActiveRecord::Import::Sqlite3Adapter
+module ActiveRecord::Import::SQLite3Adapter
   def next_value_for_sequence(sequence_name)
     %{nextval('#{sequence_name}')}
   end

data/lib/activerecord-import/base.rb

@@ -5,10 +5,20 @@ require "active_record/version"
 module ActiveRecord::Import
   AdapterPath = File.join File.expand_path(File.dirname(__FILE__)), "/active_record/adapters"
 
+  def self.base_adapter(adapter)
+    case adapter
+    when 'mysqlspatial' then 'mysql'
+    when 'mysql2spatial' then 'mysql2'
+    when 'spatialite' then 'sqlite3'
+    when 'postgis' then 'postgresql'
+    else adapter
+    end
+  end
+  
   # Loads the import functionality for a specific database adapter
   def self.require_adapter(adapter)
     require File.join(AdapterPath,"/abstract_adapter")
-    require File.join(AdapterPath,"/#{adapter}_adapter")
+    require File.join(AdapterPath,"/#{base_adapter(adapter)}_adapter")
   end
 
   # Loads the import functionality for the passed in ActiveRecord connection

data/lib/activerecord-import/import.rb

@@ -137,8 +137,8 @@ class ActiveRecord::Base
     #
     #  # Example synchronizing unsaved/new instances in memory by using a uniqued imported field
     #  posts = [BlogPost.new(:title => "Foo"), BlogPost.new(:title => "Bar")]
-    #  BlogPost.import posts, :synchronize => posts
-    #  puts posts.first.new_record? # => false
+    #  BlogPost.import posts, :synchronize => posts, :synchronize_keys => [:title]
+    #  puts posts.first.persisted? # => true
     #
     # == On Duplicate Key Update (MySQL only)
     #
@@ -276,6 +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={} )
+      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 }
+      end
+
       columns = column_names.each_with_index.map do |name, i|
         column = columns_hash[name.to_s]
 
@@ -310,14 +317,22 @@ class ActiveRecord::Base
     # Returns SQL the VALUES for an INSERT statement given the passed in +columns+
     # and +array_of_attributes+.
     def values_sql_for_columns_and_attributes(columns, array_of_attributes)   # :nodoc:
+      # connection gets called a *lot* in this high intensity loop.
+      # Reuse the same one w/in the loop, otherwise it would keep being re-retreived (= lots of time for large imports)
+      connection_memo = connection
       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)
+          # be sure to query sequence_name *last*, only if cheaper tests fail, because it's costly
+          if val.nil? && column.name == primary_key && !sequence_name.blank?
+             connection_memo.next_value_for_sequence(sequence_name)
           else
-            connection.quote(column.type_cast(val), column)
+            if serialized_attributes.include?(column.name)
+              connection_memo.quote(serialized_attributes[column.name].dump(val), column)
+            else
+              connection_memo.quote(val, column)
+            end
           end
         end
         "(#{my_values.join(',')})"

data/lib/activerecord-import/synchronize.rb

@@ -43,6 +43,10 @@ module ActiveRecord # :nodoc:
           instance.clear_aggregation_cache
           instance.clear_association_cache
           instance.instance_variable_set '@attributes', matched_instance.attributes
+          # Since the instance now accurately reflects the record in
+          # the database, ensure that instance.persisted? is true.
+          instance.instance_variable_set '@new_record', false
+          instance.instance_variable_set '@destroyed', false
         end
       end
     end
@@ -52,4 +56,4 @@ module ActiveRecord # :nodoc:
       self.class.synchronize(instances, key)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -95,6 +95,7 @@ files:
 - 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/mysql2_adapter.rb
 - lib/activerecord-import/adapters/mysql_adapter.rb
 - lib/activerecord-import/adapters/postgresql_adapter.rb
 - lib/activerecord-import/adapters/sqlite3_adapter.rb
@@ -119,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4132545664813996444
+      hash: -2739522167439917244
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: