activerecord-import 0.10.0 → 1.0.8

data/benchmarks/lib/cli_parser.rb

@@ -1,103 +1,107 @@
-require 'optparse'
-require 'ostruct'
-
-# 
-# == PARAMETERS
-# * a - database adapter. ie: mysql, postgresql, oracle, etc.
-# * n - number of objects to test with. ie: 1, 100, 1000, etc.
-# * t - the table types to test. ie: myisam, innodb, memory, temporary, etc.
-#
-module BenchmarkOptionParser
-  BANNER = "Usage: ruby #{$0} [options]\nSee ruby #{$0} -h for more options."
-
-  def self.print_banner
-    puts BANNER
-  end
-  
-  def self.print_banner!
-    print_banner
-    exit
-  end
-  
-  def self.print_options( options )
-    puts "Benchmarking the following options:"
-    puts "  Database adapter: #{options.adapter}"
-    puts "  Number of objects: #{options.number_of_objects}"
-    puts "  Table types:"
-    print_valid_table_types( options, :prefix=>"    " )
-  end
-  
-  # TODO IMPLEMENT THIS
-  def self.print_valid_table_types( options, hsh={:prefix=>''} )
-    if options.table_types.keys.size > 0
-      options.table_types.keys.sort.each{ |type| puts hsh[:prefix].to_s + type.to_s }
-    else
-      puts 'No table types defined.'
-    end
-  end
-  
-  def self.parse( args )
-    options = OpenStruct.new( 
-      :table_types => {}, 
-      :delete_on_finish => true,
-      :number_of_objects => [],
-      :outputs => [] )
-    
-    opts = OptionParser.new do |opts|
-      opts.banner = BANNER
-      
-      # parse the database adapter
-      opts.on( "a", "--adapter [String]", 
-        "The database adapter to use. IE: mysql, postgresql, oracle" ) do |arg|
-        options.adapter = arg
-      end
-      
-      # parse do_not_delete flag
-      opts.on( "d", "--do-not-delete", 
-        "By default all records in the benchmark tables will be deleted at the end of the benchmark. " +
-        "This flag indicates not to delete the benchmark data." ) do |arg|
-        options.delete_on_finish = false
-      end
-      
-      # parse the number of row objects to test
-      opts.on( "n", "--num [Integer]",
-        "The number of objects to benchmark." ) do |arg|
-        options.number_of_objects << arg.to_i
-      end
-      
-      # parse the table types to test
-      opts.on( "t", "--table-type [String]",
-        "The table type to test. This can be used multiple times." ) do |arg|
-        if arg =~ /^all$/
-          options.table_types['all'] = options.benchmark_all_types = true
-        else
-          options.table_types[arg] = true
-        end        
-      end
-
-      # print results in CSV format
-      opts.on( "--to-csv [String]", "Print results in a CSV file format" ) do |filename|
-        options.outputs << OpenStruct.new( :format=>'csv', :filename=>filename)
-      end
-
-      # print results in HTML format
-      opts.on( "--to-html [String]", "Print results in HTML format" ) do |filename|
-        options.outputs << OpenStruct.new( :format=>'html', :filename=>filename )
-      end
-    end #end opt.parse!
-
-    begin 
-      opts.parse!( args )
-      if options.table_types.size == 0
-        options.table_types['all'] = options.benchmark_all_types = true
-      end
-    rescue Exception => ex
-      print_banner!
-    end
-    
-    print_options( options )
-    
-    options
-  end
-
-end
+require 'optparse'
+require 'ostruct'
+
+#
+# == PARAMETERS
+# * a - database adapter. ie: mysql, postgresql, oracle, etc.
+# * n - number of objects to test with. ie: 1, 100, 1000, etc.
+# * t - the table types to test. ie: myisam, innodb, memory, temporary, etc.
+#
+module BenchmarkOptionParser
+  BANNER = "Usage: ruby #{$0} [options]\nSee ruby #{$0} -h for more options.".freeze
+
+  def self.print_banner
+    puts BANNER
+  end
+
+  def self.print_banner!
+    print_banner
+    exit
+  end
+
+  def self.print_options( options )
+    puts "Benchmarking the following options:"
+    puts "  Database adapter: #{options.adapter}"
+    puts "  Number of objects: #{options.number_of_objects}"
+    puts "  Table types:"
+    print_valid_table_types( options, prefix: "    " )
+  end
+
+  # TODO IMPLEMENT THIS
+  def self.print_valid_table_types( options, hsh = { prefix: '' } )
+    if !options.table_types.keys.empty?
+      options.table_types.keys.sort.each { |type| puts hsh[:prefix].to_s + type.to_s }
+    else
+      puts 'No table types defined.'
+    end
+  end
+
+  def self.parse( args )
+    options = OpenStruct.new(
+      adapter: 'mysql2',
+      table_types: {},
+      delete_on_finish: true,
+      number_of_objects: [],
+      outputs: []
+    )
+
+    opt_parser = OptionParser.new do |opts|
+      opts.banner = BANNER
+
+      # parse the database adapter
+      opts.on( "a", "--adapter [String]",
+        "The database adapter to use. IE: mysql, postgresql, oracle" ) do |arg|
+        options.adapter = arg
+      end
+
+      # parse do_not_delete flag
+      opts.on( "d", "--do-not-delete",
+        "By default all records in the benchmark tables will be deleted at the end of the benchmark. " \
+        "This flag indicates not to delete the benchmark data." ) do |_|
+        options.delete_on_finish = false
+      end
+
+      # parse the number of row objects to test
+      opts.on( "n", "--num [Integer]",
+        "The number of objects to benchmark." ) do |arg|
+        options.number_of_objects << arg.to_i
+      end
+
+      # parse the table types to test
+      opts.on( "t", "--table-type [String]",
+        "The table type to test. This can be used multiple times." ) do |arg|
+        if arg =~ /^all$/
+          options.table_types['all'] = options.benchmark_all_types = true
+        else
+          options.table_types[arg] = true
+        end
+      end
+
+      # print results in CSV format
+      opts.on( "--to-csv [String]", "Print results in a CSV file format" ) do |filename|
+        options.outputs << OpenStruct.new( format: 'csv', filename: filename)
+      end
+
+      # print results in HTML format
+      opts.on( "--to-html [String]", "Print results in HTML format" ) do |filename|
+        options.outputs << OpenStruct.new( format: 'html', filename: filename )
+      end
+    end # end opt.parse!
+
+    begin
+      opt_parser.parse!( args )
+      if options.table_types.empty?
+        options.table_types['all'] = options.benchmark_all_types = true
+      end
+    rescue Exception
+      print_banner!
+    end
+
+    options.number_of_objects = [1000] if options.number_of_objects.empty?
+    options.outputs = [OpenStruct.new( format: 'html', filename: 'benchmark.html')] if options.outputs.empty?
+
+    print_options( options )
+
+    options
+  end
+end

data/benchmarks/lib/{mysql_benchmark.rb → mysql2_benchmark.rb}

@@ -1,22 +1,19 @@
-class MysqlBenchmark < BenchmarkBase
-    
-  def benchmark_all( array_of_cols_and_vals )
-    methods = self.methods.find_all { |m| m =~ /benchmark_/ }
-    methods.delete_if{ |m| m =~ /benchmark_(all|model)/ }
-    methods.each { |method| self.send( method, array_of_cols_and_vals ) }
-  end
-  
-  def benchmark_myisam( array_of_cols_and_vals )
-    bm_model( TestMyISAM, array_of_cols_and_vals )
-  end
-    
-  def benchmark_innodb( array_of_cols_and_vals )
-    bm_model( TestInnoDb, array_of_cols_and_vals )
-  end
-  
-  def benchmark_memory( array_of_cols_and_vals )
-    bm_model( TestMemory, array_of_cols_and_vals )
-  end
-    
-end
-
+class Mysql2Benchmark < BenchmarkBase
+  def benchmark_all( array_of_cols_and_vals )
+    methods = self.methods.find_all { |m| m =~ /benchmark_/ }
+    methods.delete_if { |m| m =~ /benchmark_(all|model)/ }
+    methods.each { |method| send( method, array_of_cols_and_vals ) }
+  end
+
+  def benchmark_myisam( array_of_cols_and_vals )
+    bm_model( TestMyISAM, array_of_cols_and_vals )
+  end
+
+  def benchmark_innodb( array_of_cols_and_vals )
+    bm_model( TestInnoDb, array_of_cols_and_vals )
+  end
+
+  def benchmark_memory( array_of_cols_and_vals )
+    bm_model( TestMemory, array_of_cols_and_vals )
+  end
+end

data/benchmarks/lib/output_to_csv.rb

@@ -1,12 +1,13 @@
-require 'fastercsv'
+require 'csv'
 
 module OutputToCSV
   def self.output_results( filename, results )
-    FasterCSV.open( filename, 'w' ) do |csv|
+    CSV.open( filename, 'w' ) do |csv|
       # Iterate over each result set, which contains many results
       results.each do |result_set|
-        columns, times = [], []
-        result_set.each do |result| 
+        columns = []
+        times = []
+        result_set.each do |result|
           columns << result.description
           times << result.tms.real
         end

data/benchmarks/lib/output_to_html.rb

@@ -1,8 +1,7 @@
 require 'erb'
 
 module OutputToHTML
-
-TEMPLATE_HEADER =<<"EOT"
+  TEMPLATE_HEADER = <<"EOT".freeze
   <div>
     All times are rounded to the nearest thousandth for display purposes. Speedups next to each time are computed
     before any rounding occurs. Also, all speedup calculations are computed by comparing a given time against
@@ -10,7 +9,7 @@ TEMPLATE_HEADER =<<"EOT"
    </div>
 EOT
 
-TEMPLATE =<<"EOT"
+  TEMPLATE = <<"EOT".freeze
  <style>
  td#benchmarkTitle {
    border: 1px solid black;
@@ -43,27 +42,23 @@ EOT
   def self.output_results( filename, results )
     html = ''
     results.each do |result_set|
-      columns, times = [], []
+      columns = []
+      times = []
       result_set.each do |result|
         columns << result.description
         if result.failed
           times << "failed"
         else
           time = result.tms.real.round_to( 3 )
-          speedup = ( result_set.first.tms.real / result.tms.real ).round 
-
-          if result == result_set.first
-            times << "#{time}"
-          else
-            times << "#{time} (#{speedup}x speedup)"
-          end
+          speedup = ( result_set.first.tms.real / result.tms.real ).round
+          times << (result == result_set.first ? time.to_s : "#{time} (#{speedup}x speedup)")
         end
       end
 
       template = ERB.new( TEMPLATE, 0, "%<>")
       html << template.result( binding )
     end
-    
-    File.open( filename, 'w' ){ |file| file.write( TEMPLATE_HEADER + html ) }
+
+    File.open( filename, 'w' ) { |file| file.write( TEMPLATE_HEADER + html ) }
   end
 end

data/benchmarks/models/test_innodb.rb

@@ -1,3 +1,3 @@
 class TestInnoDb < ActiveRecord::Base
-  set_table_name 'test_innodb'
+  self.table_name = 'test_innodb'
 end

data/benchmarks/models/test_memory.rb

@@ -1,3 +1,3 @@
 class TestMemory < ActiveRecord::Base
-  set_table_name 'test_memory'
+  self.table_name = 'test_memory'
 end

data/benchmarks/models/test_myisam.rb

@@ -1,3 +1,3 @@
 class TestMyISAM < ActiveRecord::Base
-  set_table_name 'test_myisam'
+  self.table_name = 'test_myisam'
 end

data/benchmarks/schema/mysql2_schema.rb

@@ -0,0 +1,16 @@
+ActiveRecord::Schema.define do
+  create_table :test_myisam, options: 'ENGINE=MyISAM', force: true do |t|
+    t.column :my_name, :string, null: false
+    t.column :description, :string
+  end
+
+  create_table :test_innodb, options: 'ENGINE=InnoDb', force: true do |t|
+    t.column :my_name, :string, null: false
+    t.column :description, :string
+  end
+
+  create_table :test_memory, options: 'ENGINE=Memory', force: true do |t|
+    t.column :my_name, :string, null: false
+    t.column :description, :string
+  end
+end

data/gemfiles/3.2.gemfile

@@ -1,4 +1,2 @@
-platforms :ruby do
-  gem 'mysql',        '>= 2.8.1'
-  gem 'activerecord', '~> 3.2.0'
-end
+gem 'activerecord', '~> 3.2.0'
+gem 'composite_primary_keys', '~> 5.0'

data/gemfiles/4.0.gemfile

@@ -1,4 +1,2 @@
-platforms :ruby do
-  gem 'mysql',        '~> 2.9'
-  gem 'activerecord', '~> 4.0.0.rc2'
-end
+gem 'activerecord', '~> 4.0.0'
+gem 'composite_primary_keys', '~> 6.0'

data/gemfiles/4.1.gemfile

@@ -1,4 +1,2 @@
-platforms :ruby do
-  gem 'mysql',        '~> 2.9'
-  gem 'activerecord', '~> 4.1'
-end
+gem 'activerecord', '~> 4.1.0'
+gem 'composite_primary_keys', '~> 7.0'

data/gemfiles/4.2.gemfile

@@ -1,4 +1,2 @@
-platforms :ruby do
-  gem 'mysql',        '~> 2.9'
-  gem 'activerecord', '~> 4.2'
-end
+gem 'activerecord', '~> 4.2.0'
+gem 'composite_primary_keys', '~> 8.0'

data/gemfiles/5.0.gemfile

@@ -0,0 +1,2 @@
+gem 'activerecord', '~> 5.0.0'
+gem 'composite_primary_keys', '~> 9.0'

data/gemfiles/5.1.gemfile

@@ -0,0 +1,2 @@
+gem 'activerecord', '~> 5.1.0'
+gem 'composite_primary_keys', '~> 10.0'

data/gemfiles/5.2.gemfile

@@ -0,0 +1,2 @@
+gem 'activerecord', '~> 5.2.0'
+gem 'composite_primary_keys', '~> 11.0'

data/gemfiles/6.0.gemfile

@@ -0,0 +1,2 @@
+gem 'activerecord', '~> 6.0.0'
+gem 'composite_primary_keys', '~> 12.0'

data/gemfiles/6.1.gemfile

@@ -0,0 +1 @@
+gem 'activerecord', '~> 6.1.0'

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

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

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

@@ -4,4 +4,3 @@ require "activerecord-import/adapters/sqlite3_adapter"
 class ActiveRecord::ConnectionAdapters::SQLite3Adapter
   include ActiveRecord::Import::SQLite3Adapter
 end
-

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

@@ -1,31 +1,30 @@
 module ActiveRecord::Import::AbstractAdapter
   module InstanceMethods
     def next_value_for_sequence(sequence_name)
-      %{#{sequence_name}.nextval}
+      %(#{sequence_name}.nextval)
     end
 
-    def insert_many( sql, values, *args ) # :nodoc:
+    def insert_many( sql, values, _options = {}, *args ) # :nodoc:
       number_of_inserts = 1
 
-      base_sql,post_sql = if sql.is_a?( String )
-        [ sql, '' ]
+      base_sql, post_sql = if sql.is_a?( String )
+        [sql, '']
       elsif sql.is_a?( Array )
-        [ sql.shift, sql.join( ' ' ) ]
+        [sql.shift, sql.join( ' ' )]
       end
 
       sql2insert = base_sql + values.join( ',' ) + post_sql
       insert( sql2insert, *args )
 
-      [number_of_inserts,[]]
+      ActiveRecord::Import::Result.new([], number_of_inserts, [], [])
     end
 
     def pre_sql_statements(options)
       sql = []
       sql << options[:pre_sql] if options[:pre_sql]
       sql << options[:command] if options[:command]
-      sql << "IGNORE" if options[:ignore]
 
-      #add keywords like IGNORE or DELAYED
+      # add keywords like IGNORE or DELAYED
       if options[:keywords].is_a?(Array)
         sql.concat(options[:keywords])
       elsif options[:keywords]
@@ -38,29 +37,36 @@ module ActiveRecord::Import::AbstractAdapter
     # Synchronizes the passed in ActiveRecord instances with the records in
     # the database by calling +reload+ on each instance.
     def after_import_synchronize( instances )
-      instances.each { |e| e.reload }
+      instances.each(&:reload)
     end
 
     # Returns an array of post SQL statements given the passed in options.
     def post_sql_statements( table_name, options ) # :nodoc:
       post_sql_statements = []
-      if options[:on_duplicate_key_update]
-        post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update] )
+
+      if supports_on_duplicate_key_update? && options[:on_duplicate_key_update]
+        post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update], options[:primary_key], options[:locking_column] )
+      elsif logger && options[:on_duplicate_key_update]
+        logger.warn "Ignoring on_duplicate_key_update because it is not supported by the database."
       end
 
-      #custom user post_sql
+      # custom user post_sql
       post_sql_statements << options[:post_sql] if options[:post_sql]
 
-      #with rollup
+      # with rollup
       post_sql_statements << rollup_sql if options[:rollup]
 
       post_sql_statements
     end
 
-    # Returns the maximum number of bytes that the server will allow
-    # in a single packet
-    def max_allowed_packet
-      NO_MAX_PACKET
+    def increment_locking_column!(table_name, results, locking_column)
+      if locking_column.present?
+        results << "\"#{locking_column}\"=#{table_name}.\"#{locking_column}\"+1"
+      end
+    end
+
+    def supports_on_duplicate_key_update?
+      false
     end
   end
 end