activerecord-import 0.10.0 → 1.0.8

data/Rakefile

@@ -11,14 +11,28 @@ namespace :display do
     puts
   end
 end
-task :default => ["display:notice"]
+task default: ["display:notice"]
 
-ADAPTERS = %w(mysql mysql2 em_mysql2 jdbcmysql jdbcpostgresql postgresql sqlite3 seamless_database_pool mysqlspatial mysql2spatial spatialite postgis)
+ADAPTERS = %w(
+  mysql2
+  mysql2_makara
+  mysql2spatial
+  jdbcmysql
+  jdbcsqlite3
+  jdbcpostgresql
+  postgresql
+  postgresql_makara
+  postgis
+  makara_postgis
+  sqlite3
+  spatialite
+  seamless_database_pool
+).freeze
 ADAPTERS.each do |adapter|
   namespace :test do
     desc "Runs #{adapter} database tests."
     Rake::TestTask.new(adapter) do |t|
-      # FactoryGirl has an issue with warnings, so turn off, so noisy
+      # FactoryBot has an issue with warnings, so turn off, so noisy
       # t.warning = true
       t.test_files = FileList["test/adapters/#{adapter}.rb", "test/*_test.rb", "test/active_record/*_test.rb", "test/#{adapter}/**/*_test.rb"]
     end
@@ -49,3 +63,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new

data/activerecord-import.gemspec

@@ -4,20 +4,20 @@ require File.expand_path('../lib/activerecord-import/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Zach Dennis"]
   gem.email         = ["zach.dennis@gmail.com"]
-  gem.summary       = "Bulk-loading extension for ActiveRecord"
-  gem.description   = "Extraction of the ActiveRecord::Base#import functionality from ar-extensions for Rails 3 and beyond"
-  gem.homepage      = "http://github.com/zdennis/activerecord-import"
-  gem.license       = "Ruby"
+  gem.summary       = "Bulk insert extension for ActiveRecord"
+  gem.description   = "A library for bulk inserting data using ActiveRecord."
+  gem.homepage      = "https://github.com/zdennis/activerecord-import"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "activerecord-import"
   gem.require_paths = ["lib"]
   gem.version       = ActiveRecord::Import::VERSION
 
-  gem.required_ruby_version = ">= 1.9.2"
+  gem.required_ruby_version = ">= 2.0.0"
 
-  gem.add_runtime_dependency "activerecord", ">= 3.0"
+  gem.add_runtime_dependency "activerecord", ">= 3.2"
   gem.add_development_dependency "rake"
 end

data/benchmarks/README

@@ -15,10 +15,10 @@ See "ruby benchmark.rb -h" for the complete listing of options.
 EXAMPLES
 --------
 To output to html format:
-  ruby benchmark.rb --adapter=mysql --to-html=results.html
+  ruby benchmark.rb --adapter=mysql2 --to-html=results.html
 
 To output to csv format:
-  ruby benchmark.rb --adapter=mysql --to-csv=results.csv
+  ruby benchmark.rb --adapter=mysql2 --to-csv=results.csv
 
 LIMITATIONS
 -----------

data/benchmarks/benchmark.rb

@@ -1,64 +1,68 @@
-require "pathname"
-this_dir = Pathname.new File.dirname(__FILE__)
-require this_dir.join('boot')
-
-# Parse the options passed in via the command line
-options = BenchmarkOptionParser.parse( ARGV )
-
-# The support directory where we use to load our connections and models for the 
-# benchmarks.
-SUPPORT_DIR = this_dir.join('../test')
-
-# Load the database adapter
-adapter = options.adapter
-
-# load the library
-LIB_DIR = this_dir.join("../lib")
-require LIB_DIR.join("activerecord-import/#{adapter}")
-
-ActiveRecord::Base.logger = Logger.new("log/test.log")
-ActiveRecord::Base.logger.level = Logger::DEBUG
-ActiveRecord::Base.configurations["test"] = YAML.load(SUPPORT_DIR.join("database.yml").open)[adapter]
-ActiveRecord::Base.establish_connection "test"
-
-ActiveSupport::Notifications.subscribe(/active_record.sql/) do |event, _, _, _, hsh|
-  ActiveRecord::Base.logger.info hsh[:sql]
-end
-
-adapter_schema = SUPPORT_DIR.join("schema/#{adapter}_schema.rb")
-require adapter_schema if File.exists?(adapter_schema)
-Dir[this_dir.join("models/*.rb")].each{ |file| require file }
-
-# Load databse specific benchmarks
-require File.join( File.dirname( __FILE__ ), 'lib', "#{adapter}_benchmark" )
-
-# TODO implement method/table-type selection
-table_types = nil
-if options.benchmark_all_types
-  table_types = [ "all" ]
-else
-  table_types = options.table_types.keys
-end
-puts
-
-letter = options.adapter[0].chr
-clazz_str = letter.upcase + options.adapter[1..-1].downcase
-clazz = Object.const_get( clazz_str + "Benchmark" )
-
-benchmarks = []
-options.number_of_objects.each do |num|
-  benchmarks << (benchmark = clazz.new)
-  benchmark.send( "benchmark", table_types, num )
-end
-
-options.outputs.each do |output|
-  format = output.format.downcase
-  output_module = Object.const_get( "OutputTo#{format.upcase}" )
-  benchmarks.each do |benchmark|
-    output_module.output_results( output.filename, benchmark.results )
-  end
-end
-
-puts
-puts "Done with benchmark!"
-
+require 'pathname'
+require "fileutils"
+require "active_record"
+require "active_record/base"
+
+benchmark_dir = File.dirname(__FILE__)
+
+$LOAD_PATH.unshift('.')
+
+# Get the gem into the load path
+$LOAD_PATH.unshift(File.join(benchmark_dir, '..', 'lib'))
+
+# Load the benchmark files
+Dir[File.join( benchmark_dir, 'lib', '*.rb' )].sort.each { |f| require f }
+
+# Parse the options passed in via the command line
+options = BenchmarkOptionParser.parse( ARGV )
+
+FileUtils.mkdir_p 'log'
+ActiveRecord::Base.configurations["test"] = YAML.load_file(File.join(benchmark_dir, "../test/database.yml"))[options.adapter]
+ActiveRecord::Base.logger = Logger.new("log/test.log")
+ActiveRecord::Base.logger.level = Logger::DEBUG
+ActiveRecord::Base.default_timezone = :utc
+
+require "activerecord-import"
+ActiveRecord::Base.establish_connection(:test)
+
+ActiveSupport::Notifications.subscribe(/active_record.sql/) do |_, _, _, _, hsh|
+  ActiveRecord::Base.logger.info hsh[:sql]
+end
+
+# Load base/generic schema
+require File.join(benchmark_dir, "../test/schema/version")
+require File.join(benchmark_dir, "../test/schema/generic_schema")
+adapter_schema = File.join(benchmark_dir, "schema/#{options.adapter}_schema.rb")
+require adapter_schema if File.exist?(adapter_schema)
+
+Dir[File.dirname(__FILE__) + "/models/*.rb"].each { |file| require file }
+
+require File.join( benchmark_dir, 'lib', "#{options.adapter}_benchmark" )
+
+table_types = nil
+table_types = if options.benchmark_all_types
+  ["all"]
+else
+  options.table_types.keys
+end
+
+letter = options.adapter[0].chr
+clazz_str = letter.upcase + options.adapter[1..-1].downcase
+clazz = Object.const_get( clazz_str + "Benchmark" )
+
+benchmarks = []
+options.number_of_objects.each do |num|
+  benchmarks << (benchmark = clazz.new)
+  benchmark.send( "benchmark", table_types, num )
+end
+
+options.outputs.each do |output|
+  format = output.format.downcase
+  output_module = Object.const_get( "OutputTo#{format.upcase}" )
+  benchmarks.each do |benchmark|
+    output_module.output_results( output.filename, benchmark.results )
+  end
+end
+
+puts
+puts "Done with benchmark!"

data/benchmarks/lib/base.rb

@@ -1,137 +1,138 @@
-class BenchmarkBase
-
-  attr_reader :results
-
-  # The main benchmark method dispatcher. This dispatches the benchmarks
-  # to actual benchmark_xxxx methods.
-  # 
-  # == PARAMETERS
-  #  * table_types - an array of table types to benchmark
-  #  * num - the number of record insertions to test
-  def benchmark( table_types, num )
-    array_of_cols_and_vals = build_array_of_cols_and_vals( num )
-    table_types.each do |table_type|
-      self.send( "benchmark_#{table_type}", array_of_cols_and_vals )
-    end
-  end
-
-  # Returns an OpenStruct which contains two attritues, +description+ and +tms+ after performing an
-  # actual benchmark.
-  #
-  # == PARAMETERS
-  #  * description - the description of the block that is getting benchmarked
-  #  * blk - the block of code to benchmark
-  #
-  # == RETURNS
-  # An OpenStruct object with the following attributes:
-  #   * description - the description of the benchmark ran
-  #   * tms - a Benchmark::Tms containing the results of the benchmark
-  def bm( description, &blk )
-    tms  = nil
-    puts "Benchmarking #{description}"
-    
-    Benchmark.bm { |x| tms = x.report { blk.call } }
-    delete_all
-    failed = false
-
-    OpenStruct.new :description=>description, :tms=>tms, :failed=>failed
-  end
-  
-  # Given a model class (ie: Topic), and an array of columns and value sets
-  # this will perform all of the benchmarks necessary for this library.
-  # 
-  # == PARAMETERS
-  #  * model_clazz - the model class to benchmark (ie: Topic)
-  #  * array_of_cols_and_vals - an array of column identifiers and value sets
-  #
-  # == RETURNS
-  #  returns true
-  def bm_model( model_clazz, array_of_cols_and_vals )
-    puts
-    puts "------ Benchmarking #{model_clazz.name} -------"
-
-    cols,vals = array_of_cols_and_vals
-    num_inserts = vals.size
-
-    # add a new result group for this particular benchmark
-    group = []
-    @results << group
-
-    description = "#{model_clazz.name}.create (#{num_inserts} records)"
-    group << bm( description ) { 
-      vals.each do |values|
-        model_clazz.create create_hash_for_cols_and_vals( cols, values )
-      end  }
-
-    description = "#{model_clazz.name}.import(column, values) for #{num_inserts} records with validations"
-    group << bm( description ) { model_clazz.import cols, vals, :validate=>true }
-
-    description = "#{model_clazz.name}.import(columns, values) for #{num_inserts} records without validations"
-    group << bm( description ) { model_clazz.import cols, vals, :validate=>false }
-
-    models = []
-    array_of_attrs = []
-    
-    vals.each do |arr|
-      array_of_attrs << (attrs={})
-      arr.each_with_index { |value, i| attrs[cols[i]] = value }
-    end
-    array_of_attrs.each{ |attrs| models << model_clazz.new(attrs) }
-
-    description = "#{model_clazz.name}.import(models) for #{num_inserts} records with validations"
-    group << bm( description ) { model_clazz.import models, :validate=>true }
-
-    description = "#{model_clazz.name}.import(models) for #{num_inserts} records without validations"
-    group << bm( description ) { model_clazz.import models, :validate=>false }
-
-    true
-  end
-
-  # Returns a two element array composing of an array of columns and an array of
-  # value sets given the passed +num+.
-  #
-  # === What is a value set?
-  # A value set is an array of arrays. Each child array represents an array of value sets
-  # for a given row of data. 
-  #
-  # For example, say we wanted to represent an insertion of two records:
-  #   column_names = [ 'id', 'name', 'description' ]
-  #   record1 = [ 1, 'John Doe', 'A plumber' ]
-  #   record2 = [ 2, 'John Smith', 'A painter' ]
-  #   value_set [ record1, record2 ]
-  #
-  # == PARAMETER
-  #  * num - the number of records to create
-  def build_array_of_cols_and_vals( num )
-    cols = [ :my_name, :description ]
-    value_sets = []
-    num.times { |i| value_sets << [ "My Name #{i}", "My Description #{i}" ] }
-    [ cols, value_sets ]
-  end
-
-  # Returns a hash of column identifier to value mappings giving the passed in
-  # value array. 
-  #
-  # Example:
-  #   cols = [ 'id', 'name', 'description' ]
-  #   values = [ 1, 'John Doe', 'A plumber' ]
-  #   hsh = create_hash_for_cols_and_vals( cols, values )   
-  #   # hsh => { 'id'=>1, 'name'=>'John Doe', 'description'=>'A plumber' }
-  def create_hash_for_cols_and_vals( cols, vals )
-    h = {}
-    cols.zip( vals ){ |col,val| h[col] = val }
-    h
-  end
-
-  # Deletes all records from all ActiveRecord subclasses
-  def delete_all
-    ActiveRecord::Base.send( :subclasses ).each do |subclass|
-      subclass.delete_all if subclass.respond_to? :delete_all
-    end
-  end
-
-  def initialize   # :nodoc:
-    @results = []
-  end
-	
-end
+class BenchmarkBase
+  attr_reader :results
+
+  # The main benchmark method dispatcher. This dispatches the benchmarks
+  # to actual benchmark_xxxx methods.
+  #
+  # == PARAMETERS
+  #  * table_types - an array of table types to benchmark
+  #  * num - the number of record insertions to test
+  def benchmark( table_types, num )
+    array_of_cols_and_vals = build_array_of_cols_and_vals( num )
+    table_types.each do |table_type|
+      send( "benchmark_#{table_type}", array_of_cols_and_vals )
+    end
+  end
+
+  # Returns an OpenStruct which contains two attritues, +description+ and +tms+ after performing an
+  # actual benchmark.
+  #
+  # == PARAMETERS
+  #  * description - the description of the block that is getting benchmarked
+  #  * blk - the block of code to benchmark
+  #
+  # == RETURNS
+  # An OpenStruct object with the following attributes:
+  #   * description - the description of the benchmark ran
+  #   * tms - a Benchmark::Tms containing the results of the benchmark
+  def bm( description )
+    tms = nil
+    puts "Benchmarking #{description}"
+
+    Benchmark.bm { |x| tms = x.report { yield } }
+    delete_all
+    failed = false
+
+    OpenStruct.new description: description, tms: tms, failed: failed
+  end
+
+  # Given a model class (ie: Topic), and an array of columns and value sets
+  # this will perform all of the benchmarks necessary for this library.
+  #
+  # == PARAMETERS
+  #  * model_clazz - the model class to benchmark (ie: Topic)
+  #  * array_of_cols_and_vals - an array of column identifiers and value sets
+  #
+  # == RETURNS
+  #  returns true
+  def bm_model( model_clazz, array_of_cols_and_vals )
+    puts
+    puts "------ Benchmarking #{model_clazz.name} -------"
+
+    cols, vals = array_of_cols_and_vals
+    num_inserts = vals.size
+
+    # add a new result group for this particular benchmark
+    group = []
+    @results << group
+
+    description = "#{model_clazz.name}.create (#{num_inserts} records)"
+    group << bm( description ) do
+      vals.each do |values|
+        model_clazz.create create_hash_for_cols_and_vals( cols, values )
+      end
+    end
+
+    description = "#{model_clazz.name}.import(column, values) for #{num_inserts} records with validations"
+    group << bm( description ) { model_clazz.import cols, vals, validate: true }
+
+    description = "#{model_clazz.name}.import(columns, values) for #{num_inserts} records without validations"
+    group << bm( description ) { model_clazz.import cols, vals, validate: false }
+
+    models = []
+    array_of_attrs = []
+
+    vals.each do |arr|
+      array_of_attrs << (attrs = {})
+      arr.each_with_index { |value, i| attrs[cols[i]] = value }
+    end
+    array_of_attrs.each { |attrs| models << model_clazz.new(attrs) }
+
+    description = "#{model_clazz.name}.import(models) for #{num_inserts} records with validations"
+    group << bm( description ) { model_clazz.import models, validate: true }
+
+    description = "#{model_clazz.name}.import(models) for #{num_inserts} records without validations"
+    group << bm( description ) { model_clazz.import models, validate: false }
+
+    true
+  end
+
+  # Returns a two element array composing of an array of columns and an array of
+  # value sets given the passed +num+.
+  #
+  # === What is a value set?
+  # A value set is an array of arrays. Each child array represents an array of value sets
+  # for a given row of data.
+  #
+  # For example, say we wanted to represent an insertion of two records:
+  #   column_names = [ 'id', 'name', 'description' ]
+  #   record1 = [ 1, 'John Doe', 'A plumber' ]
+  #   record2 = [ 2, 'John Smith', 'A painter' ]
+  #   value_set [ record1, record2 ]
+  #
+  # == PARAMETER
+  #  * num - the number of records to create
+  def build_array_of_cols_and_vals( num )
+    cols = [:my_name, :description]
+    value_sets = []
+    num.times { |i| value_sets << ["My Name #{i}", "My Description #{i}"] }
+    [cols, value_sets]
+  end
+
+  # Returns a hash of column identifier to value mappings giving the passed in
+  # value array.
+  #
+  # Example:
+  #   cols = [ 'id', 'name', 'description' ]
+  #   values = [ 1, 'John Doe', 'A plumber' ]
+  #   hsh = create_hash_for_cols_and_vals( cols, values )
+  #   # hsh => { 'id'=>1, 'name'=>'John Doe', 'description'=>'A plumber' }
+  def create_hash_for_cols_and_vals( cols, vals )
+    h = {}
+    cols.zip( vals ) { |col, val| h[col] = val }
+    h
+  end
+
+  # Deletes all records from all ActiveRecord subclasses
+  def delete_all
+    ActiveRecord::Base.send( :subclasses ).each do |subclass|
+      if subclass.table_exists? && subclass.respond_to?(:delete_all)
+        subclass.delete_all
+      end
+    end
+  end
+
+  def initialize # :nodoc:
+    @results = []
+  end
+end