deac/activerecord-import
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #21 from jamiecobbett/master

Browse source 
Fix import of very large datasets containing multibyte chars on Ruby 1.9
This commit is contained in:
Zach Dennis 2011-06-22 19:51:29 -07:00
commit 5a71efa2b4
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/activerecord-import/adapters/abstract_adapter.rb
View file

@ -6,7 +6,7 @@ module ActiveRecord::Import::AbstractAdapter
# 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.size }
objects.inject( 0 ){ |sum,o| sum += o.bytesize }
end
def get_insert_value_sets( values, sql_size, max_bytes ) # :nodoc:
@ -16,12 +16,12 @@ module ActiveRecord::Import::AbstractAdapter
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