activerecord-import 0.2.8 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/lib/activerecord-import.rb

@@ -2,15 +2,15 @@ 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)
+      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|
-  if !ActiveRecord.const_defined?(:Import) || !ActiveRecord::Import.respond_to?(:load_from_connection)
+ActiveSupport.on_load(:active_record_connection_established) do |connection_pool|
+  if !ActiveRecord.const_defined?(:Import) || !ActiveRecord::Import.respond_to?(:load_from_connection_pool)
     require File.join File.dirname(__FILE__),  "activerecord-import/base"
   end
-  ActiveRecord::Import.load_from_connection connection
+  ActiveRecord::Import.load_from_connection_pool connection_pool
 end

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

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

data/lib/activerecord-import/active_record/adapters/mysql_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
-end
+  include ActiveRecord::Import::MysqlAdapter
+end

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

@@ -2,6 +2,6 @@ require "active_record/connection_adapters/postgresql_adapter"
 require "activerecord-import/adapters/postgresql_adapter"
 
 class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-  include ActiveRecord::Import::PostgreSQLAdapter::InstanceMethods
+  include ActiveRecord::Import::PostgreSQLAdapter
 end
 

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

@@ -2,6 +2,6 @@ require "active_record/connection_adapters/sqlite3_adapter"
 require "activerecord-import/adapters/sqlite3_adapter"
 
 class ActiveRecord::ConnectionAdapters::Sqlite3Adapter
-  include ActiveRecord::Import::Sqlite3Adapter::InstanceMethods
+  include ActiveRecord::Import::Sqlite3Adapter
 end
 

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

@@ -3,12 +3,6 @@ module ActiveRecord::Import::AbstractAdapter
   QUERY_OVERHEAD = 8 #This was shown to be true for MySQL, but it's not clear where the overhead is from.
     
   module ClassMethods
-    # Returns the sum of the sizes of the passed in objects. This should
-    # probably be moved outside this class, but to where?
-    def sum_sizes( *objects ) # :nodoc:
-      objects.inject( 0 ){ |sum,o| sum += o.bytesize }
-    end
-
     def get_insert_value_sets( values, sql_size, max_bytes ) # :nodoc:
       value_sets = []          
       arr, current_arr_values_size, current_size = [], 0, 0
@@ -51,7 +45,7 @@ module ActiveRecord::Import::AbstractAdapter
       sql_size = QUERY_OVERHEAD + base_sql.size + post_sql.size 
 
       # the number of bytes the requested insert statement values will take up
-      values_in_bytes = self.class.sum_sizes( *values )
+      values_in_bytes = values.sum {|value| value.bytesize }
     
       # the number of bytes (commas) it will take to comma separate our values
       comma_separated_bytes = values.size-1

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

@@ -1,59 +1,53 @@
 module ActiveRecord::Import::MysqlAdapter
-  module InstanceMethods
-    def self.included(klass)
-      klass.instance_eval do
-        include ActiveRecord::Import::ImportSupport  
-        include ActiveRecord::Import::OnDuplicateKeyUpdateSupport
-      end
-    end
-    
-    # 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
-    end
-    
-    # Returns a generated ON DUPLICATE KEY UPDATE statement given the passed
-    # in +args+. 
-    def sql_for_on_duplicate_key_update( table_name, *args ) # :nodoc:
-      sql = ' ON DUPLICATE KEY UPDATE '
-      arg = args.first
-      if arg.is_a?( Array )
-        sql << sql_for_on_duplicate_key_update_as_array( table_name, arg )
-      elsif arg.is_a?( Hash )
-        sql << sql_for_on_duplicate_key_update_as_hash( table_name, arg )
-      elsif arg.is_a?( String )
-        sql << arg
-      else
-        raise ArgumentError.new( "Expected Array or Hash" )
-      end
-      sql
-    end
+  include ActiveRecord::Import::ImportSupport  
+  include ActiveRecord::Import::OnDuplicateKeyUpdateSupport
 
-    def sql_for_on_duplicate_key_update_as_array( table_name, arr )  # :nodoc:
-      results = arr.map do |column|
-        qc = quote_column_name( column )
-        "#{table_name}.#{qc}=VALUES(#{qc})"        
-      end
-      results.join( ',' )
-    end
+  # 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
+  end
   
-    def sql_for_on_duplicate_key_update_as_hash( table_name, hsh ) # :nodoc:
-      sql = ' ON DUPLICATE KEY UPDATE '
-      results = hsh.map do |column1, column2|
-        qc1 = quote_column_name( column1 )
-        qc2 = quote_column_name( column2 )
-        "#{table_name}.#{qc1}=VALUES( #{qc2} )"
-      end
-      results.join( ',')
+  # Returns a generated ON DUPLICATE KEY UPDATE statement given the passed
+  # in +args+. 
+  def sql_for_on_duplicate_key_update( table_name, *args ) # :nodoc:
+    sql = ' ON DUPLICATE KEY UPDATE '
+    arg = args.first
+    if arg.is_a?( Array )
+      sql << sql_for_on_duplicate_key_update_as_array( table_name, arg )
+    elsif arg.is_a?( Hash )
+      sql << sql_for_on_duplicate_key_update_as_hash( table_name, arg )
+    elsif arg.is_a?( String )
+      sql << arg
+    else
+      raise ArgumentError.new( "Expected Array or Hash" )
     end
+    sql
+  end
 
-    #return true if the statement is a duplicate key record error
-    def duplicate_key_update_error?(exception)# :nodoc:
-      exception.is_a?(ActiveRecord::StatementInvalid) && exception.to_s.include?('Duplicate entry')
+  def sql_for_on_duplicate_key_update_as_array( table_name, arr )  # :nodoc:
+    results = arr.map do |column|
+      qc = quote_column_name( column )
+      "#{table_name}.#{qc}=VALUES(#{qc})"
     end
+    results.join( ',' )
+  end
+
+  def sql_for_on_duplicate_key_update_as_hash( table_name, hsh ) # :nodoc:
+    sql = ' ON DUPLICATE KEY UPDATE '
+    results = hsh.map do |column1, column2|
+      qc1 = quote_column_name( column1 )
+      qc2 = quote_column_name( column2 )
+      "#{table_name}.#{qc1}=VALUES( #{qc2} )"
+    end
+    results.join( ',')
+  end
+
+  #return true if the statement is a duplicate key record error
+  def duplicate_key_update_error?(exception)# :nodoc:
+    exception.is_a?(ActiveRecord::StatementInvalid) && exception.to_s.include?('Duplicate entry')
   end
-end
+end

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

@@ -1,13 +1,7 @@
 module ActiveRecord::Import::PostgreSQLAdapter
-  module InstanceMethods
-    def self.included(klass)
-      klass.instance_eval do
-        include ActiveRecord::Import::ImportSupport
-      end
-    end
+  include ActiveRecord::Import::ImportSupport
 
-    def next_value_for_sequence(sequence_name)
-      %{nextval('#{sequence_name}')}
-    end
+  def next_value_for_sequence(sequence_name)
+    %{nextval('#{sequence_name}')}
   end
 end

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

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

data/lib/activerecord-import/base.rb

@@ -12,12 +12,8 @@ module ActiveRecord::Import
   end
 
   # Loads the import functionality for the passed in ActiveRecord connection
-  def self.load_from_connection(connection)
-    import_adapter = "ActiveRecord::Import::#{connection.class.name.demodulize}::InstanceMethods"
-    unless connection.class.ancestors.map(&:name).include?(import_adapter)
-      config = connection.instance_variable_get :@config
-      require_adapter config[:adapter]
-    end
+  def self.load_from_connection_pool(connection_pool)
+    require_adapter connection_pool.spec.config[:adapter]
   end
 end
 

data/test/support/mysql/import_examples.rb

@@ -9,7 +9,7 @@ def should_support_mysql_import_functionality
         "('7','8','9')" ]
       
       adapter = ActiveRecord::Base.connection.class
-      values_size_in_bytes = adapter.sum_sizes( *values )
+      values_size_in_bytes = values.sum {|value| value.bytesize }
       base_sql_size_in_bytes = 15
       max_bytes = 30
     
@@ -38,7 +38,7 @@ def should_support_mysql_import_functionality
         base_sql_size_in_bytes = 15
         max_bytes = 26
         
-        values_size_in_bytes = adapter.sum_sizes( *values )            
+        values_size_in_bytes = values.sum {|value| value.bytesize }
         value_sets = adapter.get_insert_value_sets( values, base_sql_size_in_bytes, max_bytes )
         
         assert_equal 2, value_sets.size, 'Two value sets were expected!'

metadata

@@ -1,70 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activerecord-import
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.9
   prerelease: 
-  version: 0.2.8
 platform: ruby
-authors: 
+authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70098107427660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0pre
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70098107427660
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70098107425120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70098107425120
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70098107421120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70098107421120
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70098107418880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0pre
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-description: Extraction of the ActiveRecord::Base#import functionality from ar-extensions for Rails 3 and beyond
+  version_requirements: *70098107418880
+description: Extraction of the ActiveRecord::Base#import functionality from ar-extensions
+  for Rails 3 and beyond
 email: zach.dennis@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - Rakefile
 - VERSION
@@ -112,35 +110,32 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/zdennis/activerecord-import
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2563263173991236631
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2341236183371821495
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Bulk-loading extension for ActiveRecord
-test_files: 
+test_files:
 - test/active_record/connection_adapter_test.rb
 - test/adapters/jdbcmysql.rb
 - test/adapters/mysql.rb