activerecord-import 1.0.2 → 1.7.0

data/LICENSE

@@ -1,56 +1,21 @@
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the
-2-clause BSDL (see the file BSDL), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
-
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
-
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+The MIT License (MIT)
+
+Copyright (c) 2020 Zach Dennis <zach.dennis@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.markdown

@@ -1,6 +1,6 @@
-# activerecord-import [![Build Status](https://travis-ci.org/zdennis/activerecord-import.svg?branch=master)](https://travis-ci.org/zdennis/activerecord-import)
+# Activerecord-Import ![Build Status](https://github.com/zdennis/activerecord-import/actions/workflows/test.yaml/badge.svg)
 
-activerecord-import is a library for bulk inserting data using ActiveRecord.
+Activerecord-Import is a library for bulk inserting data using ActiveRecord.
 
 One of its major features is following activerecord associations and generating the minimal
 number of SQL insert statements required, avoiding the N+1 insert problem. An example probably
@@ -23,10 +23,10 @@ an 18 hour batch process to <2 hrs.
 
 The gem provides the following high-level features:
 
-* activerecord-import can work with raw columns and arrays of values (fastest)
-* activerecord-import works with model objects (faster)
-* activerecord-import can perform validations (fast)
-* activerecord-import can perform on duplicate key updates (requires MySQL or Postgres 9.5+)
+* Works with raw columns and arrays of values (fastest)
+* Works with model objects (faster)
+* Performs validations (fast)
+* Performs on duplicate key updates (requires MySQL, SQLite 3.24.0+, or Postgres 9.5+)
 
 ## Table of Contents
 
@@ -54,11 +54,14 @@ The gem provides the following high-level features:
 * [More Information](#more-information)
 * [Contributing](#contributing)
   * [Running Tests](#running-tests)
+  * [Issue Triage](#issue-triage)
 
 ### Examples
 
 #### Introduction
 
+This gem adds an `import` method (or `bulk_import`, for compatibility with gems like `elasticsearch-model`; see [Conflicts With Other Gems](#conflicts-with-other-gems)) to ActiveRecord classes.
+
 Without `activerecord-import`, you'd write something like this:
 
 ```ruby
@@ -85,7 +88,7 @@ The `import` method can take an array of column names (string or symbols) and an
 
 ```ruby
 columns = [ :title, :author ]
-values = [ ['Book1', 'FooManChu'], ['Book2', 'Bob Jones'] ]
+values = [ ['Book1', 'George Orwell'], ['Book2', 'Bob Jones'] ]
 
 # Importing without model validations
 Book.import columns, values, validate: false
@@ -102,7 +105,7 @@ Book.import columns, values
 The `import` method can take an array of hashes. The keys map to the column names in the database.
 
 ```ruby
-values = [{ title: 'Book1', author: 'FooManChu' }, { title: 'Book2', author: 'Bob Jones'}]
+values = [{ title: 'Book1', author: 'George Orwell' }, { title: 'Book2', author: 'Bob Jones'}]
 
 # Importing without model validations
 Book.import values, validate: false
@@ -119,7 +122,7 @@ The `import` method can take an array of column names and an array of hash objec
 
 ```ruby
 books = [
-  { title: "Book 1", author: "FooManChu" },
+  { title: "Book 1", author: "George Orwell" },
   { title: "Book 2", author: "Bob Jones" }
 ]
 columns = [ :title ]
@@ -171,7 +174,7 @@ The `import` method can take an array of models. The attributes will be pulled o
 
 ```ruby
 books = [
-  Book.new(title: "Book 1", author: "FooManChu"),
+  Book.new(title: "Book 1", author: "George Orwell"),
   Book.new(title: "Book 2", author: "Bob Jones")
 ]
 
@@ -189,7 +192,7 @@ The `import` method can take an array of column names and an array of models. Th
 
 ```ruby
 books = [
-  Book.new(title: "Book 1", author: "FooManChu"),
+  Book.new(title: "Book 1", author: "George Orwell"),
   Book.new(title: "Book 2", author: "Bob Jones")
 ]
 columns = [ :title ]
@@ -217,7 +220,7 @@ The `import` method can take a `batch_size` option to control the number of rows
 
 ```ruby
 books = [
-  Book.new(title: "Book 1", author: "FooManChu"),
+  Book.new(title: "Book 1", author: "George Orwell"),
   Book.new(title: "Book 2", author: "Bob Jones"),
   Book.new(title: "Book 1", author: "John Doe"),
   Book.new(title: "Book 2", author: "Richard Wright")
@@ -228,9 +231,22 @@ columns = [ :title ]
 Book.import columns, books, batch_size: 2
 ```
 
+If your import is particularly large or slow (possibly due to [callbacks](#callbacks)) whilst batch importing, you might want a way to report back on progress. This is supported by passing a callable as the `batch_progress` option. e.g:
+
+```ruby
+my_proc = ->(rows_size, num_batches, current_batch_number, batch_duration_in_secs) {
+  # Using the arguments provided to the callable, you can
+  # send an email, post to a websocket,
+  # update slack, alert if import is taking too long, etc.
+}
+
+Book.import columns, books, batch_size: 2, batch_progress: my_proc
+```
+
 #### Recursive
 
-NOTE: This only works with PostgreSQL.
+> **Note**
+> This only works with PostgreSQL and ActiveRecord objects. This won't work with hashes or arrays as recursive inputs.
 
 Assume that Books <code>has_many</code> Reviews.
 
@@ -246,19 +262,22 @@ Book.import books, recursive: true
 
 ### Options
 
-Key                     | Options               | Default            | Description
------------------------ | --------------------- | ------------------ | -----------
-:validate               | `true`/`false`        | `true`             | Whether or not to run `ActiveRecord` validations (uniqueness skipped). This option will always be true when using `import!`.
-:validate_uniqueness    | `true`/`false`        | `false`            | Whether or not to run uniqueness validations, has potential pitfalls, use with caution (requires `>= v0.27.0`).
-:on_duplicate_key_ignore| `true`/`false`        | `false`            | Allows skipping records with duplicate keys. See [here](https://github.com/zdennis/activerecord-import/#duplicate-key-ignore) for more details.
-:ignore                 | `true`/`false`        | `false`            | Alias for :on_duplicate_key_ignore.
-:on_duplicate_key_update| :all, `Array`, `Hash` | N/A                | Allows upsert logic to be used. See [here](https://github.com/zdennis/activerecord-import/#duplicate-key-update) for more details.
-:synchronize            | `Array`               | N/A                | An array of ActiveRecord instances. This synchronizes existing instances in memory with updates from the import.
-:timestamps             | `true`/`false`        | `true`             | Enables/disables timestamps on imported records.
-:recursive              | `true`/`false`        | `false`            | Imports has_many/has_one associations (PostgreSQL only).
-:batch_size             | `Integer`             | total # of records | Max number of records to insert per import
-:raise_error            | `true`/`false`        | `false`            | Throws an exception if there are invalid records. `import!` is a shortcut for this.
-
+Key                       | Options               | Default            | Description
+------------------------- | --------------------- | ------------------ | -----------
+:validate                 | `true`/`false`        | `true`             | Whether or not to run `ActiveRecord` validations (uniqueness skipped). This option will always be true when using `import!`.
+:validate_uniqueness      | `true`/`false`        | `false`            | Whether or not to run ActiveRecord uniqueness validations. Beware this will incur an sql query per-record (N+1 queries). (requires `>= v0.27.0`).
+:validate_with_context    | `Symbol`              |`:create`/`:update` | Allows passing an ActiveModel validation context for each model. Default is `:create` for new records and `:update` for existing ones.
+:track_validation_failures| `true`/`false`        | `false`            | When this is set to true, `failed_instances` will be an array of arrays, with each inner array having the form `[:index_in_dataset, :object_with_errors]`
+:on_duplicate_key_ignore  | `true`/`false`        | `false`            | Allows skipping records with duplicate keys. See [here](#duplicate-key-ignore) for more details.
+:ignore                   | `true`/`false`        | `false`            | Alias for :on_duplicate_key_ignore.
+:on_duplicate_key_update  | :all, `Array`, `Hash` | N/A                | Allows upsert logic to be used. See [here](#duplicate-key-update) for more details.
+:synchronize              | `Array`               | N/A                | An array of ActiveRecord instances. This synchronizes existing instances in memory with updates from the import.
+:timestamps               | `true`/`false`        | `true`             | Enables/disables timestamps on imported records.
+:recursive                | `true`/`false`        | `false`            | Imports has_many/has_one associations (PostgreSQL only).
+:recursive_on_duplicate_key_update | `Hash`       | N/A                | Allows upsert logic to be used for recursive associations. The hash key is the association name and the value has the same options as `:on_duplicate_key_update`. See [here](#duplicate-key-update) for more details.
+:batch_size               | `Integer`             | total # of records | Max number of records to insert per import
+:raise_error              | `true`/`false`        | `false`            | Raises an exception at the first invalid record. This means there will not be a result object returned. The `import!` method is a shortcut for this.
+:all_or_none              | `true`/`false`        | `false`            | Will not import any records if there is a record with validation errors.
 
 #### Duplicate Key Ignore
 
@@ -267,14 +286,14 @@ Key                     | Options               | Default            | Descripti
 For Postgres 9.5+ it adds `ON CONFLICT DO NOTHING`, for MySQL it uses `INSERT IGNORE`, and for SQLite it uses `INSERT OR IGNORE`. Cannot be enabled on a recursive import. For database adapters that normally support setting primary keys on imported objects, this option prevents that from occurring.
 
 ```ruby
-book = Book.create! title: "Book1", author: "FooManChu"
+book = Book.create! title: "Book1", author: "George Orwell"
 book.title = "Updated Book Title"
 book.author = "Bob Barker"
 
 Book.import [book], on_duplicate_key_ignore: true
 
 book.reload.title  # => "Book1"     (stayed the same)
-book.reload.author # => "FooManChu" (stayed the same)
+book.reload.author # => "George Orwell" (stayed the same)
 ```
 
 The option `:on_duplicate_key_ignore` is bypassed when `:recursive` is enabled for [PostgreSQL imports](https://github.com/zdennis/activerecord-import/wiki#recursive-example-postgresql-only).
@@ -290,7 +309,7 @@ This will use MySQL's `ON DUPLICATE KEY UPDATE` or Postgres/SQLite `ON CONFLICT
 Basic Update
 
 ```ruby
-book = Book.create! title: "Book1", author: "FooManChu"
+book = Book.create! title: "Book1", author: "George Orwell"
 book.title = "Updated Book Title"
 book.author = "Bob Barker"
 
@@ -304,13 +323,13 @@ Book.import [book], on_duplicate_key_update: {conflict_target: [:id], columns: [
 Book.import [book], on_duplicate_key_update: [:title]
 
 book.reload.title  # => "Updated Book Title" (changed)
-book.reload.author # => "FooManChu"          (stayed the same)
+book.reload.author # => "George Orwell"          (stayed the same)
 ```
 
 Using the value from another column
 
 ```ruby
-book = Book.create! title: "Book1", author: "FooManChu"
+book = Book.create! title: "Book1", author: "George Orwell"
 book.title = "Updated Book Title"
 
 # MySQL version
@@ -328,7 +347,7 @@ book.reload.author # => "Updated Book Title" (changed)
 Using Custom SQL
 
 ```ruby
-book = Book.create! title: "Book1", author: "FooManChu"
+book = Book.create! title: "Book1", author: "George Orwell"
 book.author = "Bob Barker"
 
 # MySQL version
@@ -346,10 +365,33 @@ book.reload.title  # => "Book1"      (stayed the same)
 book.reload.author # => "Bob Barker" (changed)
 ```
 
+PostgreSQL Using partial indexes
+
+```ruby
+book = Book.create! title: "Book1", author: "George Orwell", published_at: Time.now
+book.author = "Bob Barker"
+
+# in migration
+execute <<-SQL
+      CREATE INDEX books_published_at_index ON books (published_at) WHERE published_at IS NOT NULL;
+    SQL
+
+# PostgreSQL version
+Book.import [book], on_duplicate_key_update: {
+  conflict_target: [:id],
+  index_predicate: "published_at IS NOT NULL",
+  columns: [:author]
+}
+
+book.reload.title  # => "Book1"          (stayed the same)
+book.reload.author # => "Bob Barker"     (changed)
+book.reload.published_at # => 2017-10-09 (stayed the same)
+```
+
 PostgreSQL Using constraints
 
 ```ruby
-book = Book.create! title: "Book1", author: "FooManChu", edition: 3, published_at: nil
+book = Book.create! title: "Book1", author: "George Orwell", edition: 3, published_at: nil
 book.published_at = Time.now
 
 # in migration
@@ -363,7 +405,7 @@ Book.import [book], on_duplicate_key_update: {constraint_name: :for_upsert, colu
 
 
 book.reload.title  # => "Book1"          (stayed the same)
-book.reload.author # => "FooManChu"      (stayed the same)
+book.reload.author # => "George Orwell"      (stayed the same)
 book.reload.edition # => 3               (stayed the same)
 book.reload.published_at # => 2017-10-09 (changed)
 ```
@@ -374,7 +416,7 @@ Book.import books, validate_uniqueness: true
 
 ### Return Info
 
-The `import` method returns a `Result` object that responds to `failed_instances` and `num_inserts`. Additionally, for users of Postgres, there will be two arrays `ids` and `results` that can be accessed`.
+The `import` method returns a `Result` object that responds to `failed_instances` and `num_inserts`. Additionally, for users of Postgres, there will be two arrays `ids` and `results` that can be accessed.
 
 ```ruby
 articles = [
@@ -415,7 +457,9 @@ Should you wish to specify those columns, you may use the option `timestamps: fa
 
 However, it is also possible to set just `:created_at` in specific records. In this case despite using `timestamps: true`,  `:created_at` will be updated only in records where that field is `nil`. Same rule applies for record associations when enabling the option `recursive: true`.
 
-If you are using custom time zones, these will be respected when performing imports as well as long as `ActiveRecord::Base.default_timezone` is set, which for practically all Rails apps it is
+If you are using custom time zones, these will be respected when performing imports as well as long as `ActiveRecord::Base.default_timezone` is set, which for practically all Rails apps it is.
+> **Note**
+> If you are using ActiveRecord 7.0 or later, please use `ActiveRecord.default_timezone` instead.
 
 ### Callbacks
 
@@ -487,7 +531,8 @@ This allows an external gem to dynamically add an adapter without the need to ad
 
 ### Requiring
 
-Note: These instructions will only work if you are using version 0.2.0 or higher.
+> **Note**
+> These instructions will only work if you are using version 0.2.0 or higher.
 
 #### Autoloading via Bundler
 
@@ -524,7 +569,7 @@ require 'activerecord-import'
 ### Load Path Setup
 To understand how rubygems loads code you can reference the following:
 
-  http://guides.rubygems.org/patterns/#loading_code
+  http://guides.rubygems.org/patterns/#loading-code
 
 And an example of how active_record dynamically load adapters:
 
@@ -552,9 +597,9 @@ When rubygems pushes the `lib` folder onto the load path a `require` will now fi
 
 ### Conflicts With Other Gems
 
-`activerecord-import` adds the `.import` method onto `ActiveRecord::Base`. There are other gems, such as `elasticsearch-rails`, that do the same thing. In conflicts such as this, there is an aliased method named `.bulk_import` that can be used interchangeably.
+Activerecord-Import adds the `.import` method onto `ActiveRecord::Base`. There are other gems, such as `elasticsearch-rails`, that do the same thing. In conflicts such as this, there is an aliased method named `.bulk_import` that can be used interchangeably.
 
-If you are using the `apartment` gem, there is a weird triple interaction between that gem, `activerecord-import`, and `activerecord` involving caching of the `sequence_name` of a model. This can be worked around by explcitly setting this value within the model. For example:
+If you are using the `apartment` gem, there is a weird triple interaction between that gem, `activerecord-import`, and `activerecord` involving caching of the `sequence_name` of a model. This can be worked around by explicitly setting this value within the model. For example:
 
 ```ruby
 class Post < ActiveRecord::Base
@@ -579,7 +624,7 @@ See https://github.com/zdennis/activerecord-import/issues/233 for further discus
 
 ### More Information
 
-For more information on activerecord-import please see its wiki: https://github.com/zdennis/activerecord-import/wiki
+For more information on Activerecord-Import please see its wiki: https://github.com/zdennis/activerecord-import/wiki
 
 To document new information, please add to the README instead of the wiki. See https://github.com/zdennis/activerecord-import/issues/397 for discussion.
 
@@ -597,32 +642,35 @@ After that, you can run the tests. They run against multiple tests and ActiveRec
 
 This is one example of how to run the tests:
 
-```ruby
+```bash
 rm Gemfile.lock
-AR_VERSION=4.2 bundle install
-AR_VERSION=4.2 bundle exec rake test:postgresql test:sqlite3 test:mysql2
+AR_VERSION=7.0 bundle install
+AR_VERSION=7.0 bundle exec rake test:postgresql test:sqlite3 test:mysql2
 ```
 
-Once you have pushed up your changes, you can find your CI results [here](https://travis-ci.org/zdennis/activerecord-import/).
+Once you have pushed up your changes, you can find your CI results [here](https://github.com/zdennis/activerecord-import/actions).
+
+#### Docker Setup
+
+Before you begin, make sure you have [Docker](https://www.docker.com/products/docker-desktop/) and [Docker Compose](https://docs.docker.com/compose/) installed on your machine. If you don't, you can install both via Homebrew using the following command:
+
+```bash
+brew install docker && brew install docker-compose
+```
+##### Steps
+
+1. In your terminal run `docker-compose up --build`
+1. In another tab/window run `docker-compose exec app bash`
+1. In that same terminal run the mysql2 test by running `bundle exec rake test:mysql2`
+
+## Issue Triage [![Open Source Helpers](https://www.codetriage.com/zdennis/activerecord-import/badges/users.svg)](https://www.codetriage.com/zdennis/activerecord-import)
+
+You can triage issues which may include reproducing bug reports or asking for vital information, such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to activerecord-import on CodeTriage](https://www.codetriage.com/zdennis/activerecord-import).
 
 # License
 
-This is licensed under the ruby license.
+This is licensed under the MIT license.
 
 # Author
 
 Zach Dennis (zach.dennis@gmail.com)
-
-# Contributors
-
-* Jordan Owens (@jkowens)
-* Erik Michaels-Ober (@sferik)
-* Blythe Dunham
-* Gabe da Silveira
-* Henry Work
-* James Herdman
-* Marcus Crafter
-* Thibaud Guillaume-Gentil
-* Mark Van Holstyn
-* Victor Costan
-* Dillon Welch

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler"
 Bundler.setup
 
@@ -27,6 +29,7 @@ ADAPTERS = %w(
   sqlite3
   spatialite
   seamless_database_pool
+  trilogy
 ).freeze
 ADAPTERS.each do |adapter|
   namespace :test do

data/activerecord-import.gemspec

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require File.expand_path('../lib/activerecord-import/version', __FILE__)
 
 Gem::Specification.new do |gem|
@@ -6,8 +7,8 @@ Gem::Specification.new do |gem|
   gem.email         = ["zach.dennis@gmail.com"]
   gem.summary       = "Bulk insert extension for ActiveRecord"
   gem.description   = "A library for bulk inserting data using ActiveRecord."
-  gem.homepage      = "http://github.com/zdennis/activerecord-import"
-  gem.license       = "Ruby"
+  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) }
@@ -16,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ActiveRecord::Import::VERSION
 
-  gem.required_ruby_version = ">= 1.9.2"
+  gem.required_ruby_version = ">= 2.4.0"
 
-  gem.add_runtime_dependency "activerecord", ">= 3.2"
+  gem.add_runtime_dependency "activerecord", ">= 4.2"
   gem.add_development_dependency "rake"
 end

data/benchmarks/benchmark.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require "fileutils"
 require "active_record"
@@ -20,7 +22,11 @@ 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
+if ActiveRecord.respond_to?(:default_timezone)
+  ActiveRecord.default_timezone = :utc
+else
+  ActiveRecord::Base.default_timezone = :utc
+end
 
 require "activerecord-import"
 ActiveRecord::Base.establish_connection(:test)
@@ -35,7 +41,7 @@ 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 }
+Dir["#{File.dirname(__FILE__)}/models/*.rb"].sort.each { |file| require file }
 
 require File.join( benchmark_dir, 'lib', "#{options.adapter}_benchmark" )
 
@@ -47,8 +53,8 @@ else
 end
 
 letter = options.adapter[0].chr
-clazz_str = letter.upcase + options.adapter[1..-1].downcase
-clazz = Object.const_get( clazz_str + "Benchmark" )
+clazz_str = letter.upcase + options.adapter[1..].downcase
+clazz = Object.const_get( "#{clazz_str}Benchmark" )
 
 benchmarks = []
 options.number_of_objects.each do |num|

data/benchmarks/lib/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BenchmarkBase
   attr_reader :results
 
@@ -25,11 +27,11 @@ class BenchmarkBase
   # 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 )
+  def bm( description, &block )
     tms = nil
     puts "Benchmarking #{description}"
 
-    Benchmark.bm { |x| tms = x.report { yield } }
+    Benchmark.bm { |x| tms = x.report(&block) }
     delete_all
     failed = false
 

data/benchmarks/lib/cli_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optparse'
 require 'ostruct'
 
@@ -8,7 +10,7 @@ require 'ostruct'
 # * 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
+  BANNER = "Usage: ruby #{$0} [options]\nSee ruby #{$0} -h for more options."
 
   def self.print_banner
     puts BANNER
@@ -27,7 +29,7 @@ module BenchmarkOptionParser
     print_valid_table_types( options, prefix: "    " )
   end
 
-  # TODO IMPLEMENT THIS
+  # 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 }

data/benchmarks/lib/float.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Taken from http://www.programmingishard.com/posts/show/128
 # Posted by rbates
 class Float

data/benchmarks/lib/mysql2_benchmark.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mysql2Benchmark < BenchmarkBase
   def benchmark_all( array_of_cols_and_vals )
     methods = self.methods.find_all { |m| m =~ /benchmark_/ }

data/benchmarks/lib/output_to_csv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 module OutputToCSV

data/benchmarks/lib/output_to_html.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'erb'
 
 module OutputToHTML
-  TEMPLATE_HEADER = <<"EOT".freeze
+  TEMPLATE_HEADER = <<"EOT"
   <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
@@ -9,7 +11,7 @@ module OutputToHTML
    </div>
 EOT
 
-  TEMPLATE = <<"EOT".freeze
+  TEMPLATE = <<"EOT"
  <style>
  td#benchmarkTitle {
    border: 1px solid black;

data/benchmarks/models/test_innodb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TestInnoDb < ActiveRecord::Base
   self.table_name = 'test_innodb'
 end

data/benchmarks/models/test_memory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TestMemory < ActiveRecord::Base
   self.table_name = 'test_memory'
 end

data/benchmarks/models/test_myisam.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TestMyISAM < ActiveRecord::Base
   self.table_name = 'test_myisam'
 end

data/benchmarks/schema/{mysql_schema.rb → mysql2_schema.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   create_table :test_myisam, options: 'ENGINE=MyISAM', force: true do |t|
     t.column :my_name, :string, null: false