Empact-activerecord-import 0.3.3 → 0.3.4

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

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

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

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

@@ -1,60 +1,60 @@
 module ActiveRecord::Import::AbstractAdapter
   NO_MAX_PACKET = 0
   QUERY_OVERHEAD = 8 #This was shown to be true for MySQL, but it's not clear where the overhead is from.
-    
+
   module ClassMethods
     def get_insert_value_sets( values, sql_size, max_bytes ) # :nodoc:
-      value_sets = []          
+      value_sets = []
       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
         if NO_MAX_PACKET == max_bytes or sql_size_thus_far <= max_bytes
-          current_size += val.size            
+          current_size += val.bytesize
           arr << val
         else
           value_sets << arr
           arr = [ val ]
-          current_size = val.size
+          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)
       end
       [ *value_sets ]
     end
   end
-  
+
   module InstanceMethods
     def next_value_for_sequence(sequence_name)
       %{#{sequence_name}.nextval}
     end
-  
-    # +sql+ can be a single string or an array. If it is an array all 
+
+    # +sql+ can be a single string or an array. If it is an array all
     # elements that are in position >= 1 will be appended to the final SQL.
     def insert_many( sql, values, *args ) # :nodoc:
       # the number of inserts default
       number_of_inserts = 0
-    
+
       base_sql,post_sql = if sql.is_a?( String )
         [ sql, '' ]
       elsif sql.is_a?( Array )
         [ sql.shift, sql.join( ' ' ) ]
       end
-    
-      sql_size = QUERY_OVERHEAD + base_sql.size + post_sql.size 
+
+      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 = values.sum {|value| value.size }
-    
+
       # the number of bytes (commas) it will take to comma separate our values
       comma_separated_bytes = values.size-1
-    
+
       # the total number of bytes required if this statement is one statement
       total_bytes = sql_size + values_in_bytes + comma_separated_bytes
-    
+
       max = max_allowed_packet
-    
+
       # if we can insert it all as one statement
       if NO_MAX_PACKET == max or total_bytes < max
         number_of_inserts += 1

data/lib/activerecord-import/base.rb

@@ -23,6 +23,6 @@ end
 
 
 this_dir = Pathname.new File.dirname(__FILE__)
-require this_dir.join("import")
-require this_dir.join("active_record/adapters/abstract_adapter")
-require this_dir.join("synchronize")
+require this_dir.join("import").to_s
+require this_dir.join("active_record/adapters/abstract_adapter").to_s
+require this_dir.join("synchronize").to_s

metadata

@@ -1,76 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: Empact-activerecord-import
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.4
   prerelease: 
-  version: 0.3.3
 platform: ruby
-authors: 
+authors:
 - Zach Dennis
 - Ben Woosley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152287780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152287780
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2152285900 !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: *2152285900
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2152283860 !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: *2152283860
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2152281560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.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: *2152281560
+description: Extraction of the ActiveRecord::Base#import functionality from ar-extensions
+  for Rails 3 and beyond
 email: ben.woosley@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - Rakefile
 - VERSION
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
+- lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
 - 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
@@ -88,33 +87,29 @@ files:
 - lib/activerecord-import/synchronize.rb
 homepage: http://github.com/Empact/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: -548077034181520687
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2262008768261655531
+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.4
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Bulk-loading extension for ActiveRecord
 test_files: []
-