activerecord-import 0.10.0 → 1.0.8

data/lib/activerecord-import/synchronize.rb

@@ -1,6 +1,5 @@
 module ActiveRecord # :nodoc:
   class Base # :nodoc:
-
     # Synchronizes the passed in ActiveRecord instances with data
     # from the database. This is like calling reload on an individual
     # ActiveRecord instance but it is intended for use on multiple instances.
@@ -21,45 +20,46 @@ module ActiveRecord # :nodoc:
     # Post.synchronize posts, [:name] # queries on the :name column and not the :id column
     # posts.first.address # => "1245 Foo Ln" instead of whatever it was
     #
-    def self.synchronize(instances, keys=[self.primary_key])
+    def self.synchronize(instances, keys = [primary_key])
       return if instances.empty?
 
       conditions = {}
-      order = ""
 
-      key_values = keys.map { |key| instances.map(&"#{key}".to_sym) }
+      key_values = keys.map { |key| instances.map(&key.to_sym) }
       keys.zip(key_values).each { |key, values| conditions[key] = values }
-      order = keys.map{ |key| "#{key} ASC" }.join(",")
+      order = keys.map { |key| "#{key} ASC" }.join(",")
 
       klass = instances.first.class
 
-      fresh_instances = klass.where(conditions).order(order)
+      fresh_instances = klass.unscoped.where(conditions).order(order)
       instances.each do |instance|
         matched_instance = fresh_instances.detect do |fresh_instance|
-          keys.all?{ |key| fresh_instance.send(key) == instance.send(key) }
+          keys.all? { |key| fresh_instance.send(key) == instance.send(key) }
         end
 
-        if matched_instance
-          instance.clear_aggregation_cache
-          instance.clear_association_cache
-          instance.instance_variable_set :@attributes, matched_instance.instance_variable_get(:@attributes)
+        next unless matched_instance
 
-          if instance.respond_to?(:clear_changes_information)
-            instance.clear_changes_information                  # Rails 4.1 and higher
-          else
-            instance.changed_attributes.clear                   # Rails 3.1, 3.2
-          end
+        instance.send :clear_association_cache
+        instance.send :clear_aggregation_cache if instance.respond_to?(:clear_aggregation_cache, true)
+        instance.instance_variable_set :@attributes, matched_instance.instance_variable_get(:@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
+        if instance.respond_to?(:clear_changes_information)
+          instance.clear_changes_information                      # Rails 4.2 and higher
+        else
+          instance.instance_variable_set :@attributes_cache, {}   # Rails 4.0, 4.1
+          instance.changed_attributes.clear                       # Rails 3.2
+          instance.previous_changes.clear
         end
+
+        # 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
 
     # See ActiveRecord::ConnectionAdapters::AbstractAdapter.synchronize
-    def synchronize(instances, key=[ActiveRecord::Base.primary_key])
+    def synchronize(instances, key = [ActiveRecord::Base.primary_key])
       self.class.synchronize(instances, key)
     end
   end

data/lib/activerecord-import/value_sets_parser.rb

@@ -1,4 +1,14 @@
+require 'active_support/core_ext/array'
+
 module ActiveRecord::Import
+  class ValueSetTooLargeError < StandardError
+    attr_reader :size
+    def initialize(msg = "Value set exceeds max size", size = 0)
+      @size = size
+      super(msg)
+    end
+  end
+
   class ValueSetsBytesParser
     attr_reader :reserved_bytes, :max_bytes, :values
 
@@ -8,30 +18,45 @@ module ActiveRecord::Import
 
     def initialize(values, options)
       @values = values
-      @reserved_bytes = options[:reserved_bytes]
-      @max_bytes = options[:max_bytes]
+      @reserved_bytes = options[:reserved_bytes] || 0
+      @max_bytes = options.fetch(:max_bytes) { default_max_bytes }
     end
 
     def parse
       value_sets = []
-      arr, current_arr_values_size, current_size = [], 0, 0
-      values.each_with_index do |val,i|
+      arr = []
+      current_size = 0
+      values.each_with_index do |val, i|
         comma_bytes = arr.size
+        insert_size = reserved_bytes + val.bytesize
+
+        if insert_size > max_bytes
+          raise ValueSetTooLargeError.new("#{insert_size} bytes exceeds the max allowed for an insert [#{@max_bytes}]", insert_size)
+        end
+
         bytes_thus_far = reserved_bytes + current_size + val.bytesize + comma_bytes
         if bytes_thus_far <= max_bytes
           current_size += val.bytesize
           arr << val
         else
           value_sets << arr
-          arr = [ val ]
+          arr = [val]
           current_size = val.bytesize
         end
 
         # if we're on the last iteration push whatever we have in arr to value_sets
-        value_sets << arr if i == (values.size-1)
+        value_sets << arr if i == (values.size - 1)
       end
 
-      [ *value_sets ]
+      value_sets
+    end
+
+    private
+
+    def default_max_bytes
+      values_in_bytes = values.sum(&:bytesize)
+      comma_separated_bytes = values.size - 1
+      reserved_bytes + values_in_bytes + comma_separated_bytes
     end
   end
 
@@ -48,7 +73,7 @@ module ActiveRecord::Import
     end
 
     def parse
-      @values.in_groups_of(max_records, with_fill=false)
+      @values.in_groups_of(max_records, false)
     end
   end
 end

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.10.0"
+    VERSION = "1.0.8".freeze
   end
 end

data/lib/activerecord-import.rb

@@ -1,17 +1,6 @@
-class ActiveRecord::Base
-  class << self
-    def establish_connection_with_activerecord_import(*args)
-      establish_connection_without_activerecord_import(*args)
-      ActiveSupport.run_load_hooks(:active_record_connection_established, connection_pool)
-    end
-    alias_method_chain :establish_connection, :activerecord_import
-  end
-end
-
-ActiveSupport.on_load(:active_record_connection_established) do |connection_pool|
-  if !ActiveRecord.const_defined?(:Import, false) || !ActiveRecord::Import.respond_to?(:load_from_connection_pool)
-    require "activerecord-import/base"
-  end
+# rubocop:disable Style/FileName
+require "active_support/lazy_load_hooks"
 
-  ActiveRecord::Import.load_from_connection_pool connection_pool
+ActiveSupport.on_load(:active_record) do
+  require "activerecord-import/base"
 end

data/test/adapters/jdbcsqlite3.rb

@@ -0,0 +1 @@
+ENV["ARE_DB"] = "jdbcsqlite3"

data/test/adapters/makara_postgis.rb

@@ -0,0 +1 @@
+ENV["ARE_DB"] = "postgis"

data/test/adapters/mysql2_makara.rb

@@ -0,0 +1 @@
+ENV["ARE_DB"] = "mysql2_makara"

data/test/adapters/mysql2spatial.rb

@@ -1 +1 @@
-ENV["ARE_DB"] = "mysql2spatial"
+ENV["ARE_DB"] = "mysql2spatial"

data/test/adapters/postgis.rb

@@ -1 +1 @@
-ENV["ARE_DB"] = "postgis"
+ENV["ARE_DB"] = "postgis"

data/test/adapters/postgresql.rb

@@ -1 +1 @@
-ENV["ARE_DB"] = "postgresql"
+ENV["ARE_DB"] = "postgresql"

data/test/adapters/postgresql_makara.rb

@@ -0,0 +1 @@
+ENV["ARE_DB"] = "postgresql"

data/test/adapters/spatialite.rb

@@ -1 +1 @@
-ENV["ARE_DB"] = "spatialite"
+ENV["ARE_DB"] = "spatialite"

data/test/adapters/sqlite3.rb

@@ -1 +1 @@
-ENV["ARE_DB"] = "sqlite3"
+ENV["ARE_DB"] = "sqlite3"

data/test/database.yml.sample

@@ -5,31 +5,15 @@ common: &common
   host:     localhost
   database: activerecord_import_test
 
-mysql: &mysql
-  <<: *common
-  adapter: mysql
-
 mysql2: &mysql2
   <<: *common
   adapter: mysql2
 
-mysqlspatial:
-  <<: *mysql
-
 mysql2spatial:
   <<: *mysql2
 
-em_mysql2:
-  <<: *common
-  adapter: em_mysql2
-  pool: 5
-
-seamless_database_pool:
-  <<: *common
-  adapter: seamless_database_pool
-  pool_adapter: mysql2
-  master:
-    host: localhost
+mysql2_makara:
+  <<: *mysql2
 
 postgresql: &postgresql
   <<: *common
@@ -37,6 +21,9 @@ postgresql: &postgresql
   adapter: postgresql
   min_messages: warning
 
+postresql_makara:
+  <<: *postgresql
+
 postgis:
   <<: *postgresql
 
@@ -45,6 +32,14 @@ oracle:
   adapter: oracle
   min_messages: debug
 
+seamless_database_pool:
+  <<: *common
+  adapter: seamless_database_pool
+  prepared_statements: false
+  pool_adapter: mysql2
+  master:
+    host: localhost
+
 sqlite:
   adapter: sqlite
   dbfile: test.db