mass_insert 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c813a1d355a3033bd79ea76d6e2680dc50e84f
-  data.tar.gz: ce141093d4663e23ebef135d22fcce78d6c3e41f
+  metadata.gz: 776d7684b8b9dbc9d4232b18baa16db73c2e30e2
+  data.tar.gz: 5f3abd0e966d88cbf1038a5591ace5fba11170b5
 SHA512:
-  metadata.gz: 010f53e134a7c33e9dc7cbd4796b10b9a5caec4cfd3fd3db9303d315da5cade8b60298a03910b641d949156ff01c42bd6223feccddcb52ac98c1648df1c3cab9
-  data.tar.gz: 1e573ff99bda7e7653a6c96e708893c2524584d960ad54a04cc1a9ffdcc50a0d236532629a9a48c25cbfe2df449ee9bed82c234352f28054ce9a275a067b8546
+  metadata.gz: 8574e134b4e067efba5ab705e88c5ebffa6426dc4148f2849b43aceb1ce48cc154645f19fdb82dcb7c2b9136283a7de425011138edfe1e3e55180a92dcd26b59
+  data.tar.gz: 1ba5fedf3377bb938a872545f9a4c0980ddf4bc88d386e489b3189720ac208b4a1ecab3bdb409dbda3caf7b478d4afeb67c9452e9458df3b9f4c5badd5e532fb

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
+  - 2.2.2
   - 2.3.0
+  - 2.3.1
 
 before_script:
   - cp test/database.yml.example test/database.yml

data/README.md

@@ -44,7 +44,7 @@ User.mass_insert(values)
 ```
 
 
-## Insertion per batches
+### Insertion per batches
 Due you can get a database timeout error you can specify that the insertion will be in batches.
 Just pass the `per_batch` option with the records per batch. Example...
 ```ruby
@@ -52,6 +52,30 @@ User.mass_insert(values, per_batch: 1000)
 ```
 
 
+### Handle unique index on MySQL
+Sometimes we want to ignore errors when adding duplicated records. MySQL has
+the ability to do that with `ON DUPLICATE KEY UPDATE`. By using the option
+`handle_duplication` we will ignore the new values by doing:
+```ruby
+User.mass_insert(values, handle_duplication: true)
+```
+
+```sql
+INSERT INTO table (a,b,c) VALUES (1,2,3)
+  ON DUPLICATE KEY UPDATE a=a,b=b,c=c;
+```
+
+[Read more about MySQL ON DUPLICATE KEY UPDATE...](http://dev.mysql.com/doc/refman/5.7/en/insert-on-duplicate.html)
+
+
+## Running tests
+First at all copy `test/database.yml.example` to `test/database.yml` and update username and password
+for every database adapters. Then, run the following to test the gem against all adapters.
+```
+bundle exec rake test:all
+```
+
+
 ## Contributing
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/lib/mass_insert/adapters/abstract_adapter.rb

@@ -10,7 +10,7 @@ module MassInsert
       end
 
       def to_sql
-        "#{insert_sql} #{values_sql}"
+        "#{insert_sql} #{values_sql};"
       end
 
       private
@@ -38,14 +38,14 @@ module MassInsert
       end
 
       def values_sql
-        "(#{array_of_attributes_sql.join('),(')});"
+        "(#{array_of_attributes_sql.join('),(')})"
       end
 
       def array_of_attributes_sql
         values.map do |attrs|
           columns.map do |name|
             value = attrs[name.to_sym] || attrs[name.to_s]
-            connection.quote(value, columns_hash[name.to_s])
+            connection.quote(value)
           end.join(',')
         end
       end

data/lib/mass_insert/adapters/mysql2_adapter.rb

@@ -1,5 +1,21 @@
 module MassInsert
   module Adapters
-    class Mysql2Adapter < AbstractAdapter; end
+    class Mysql2Adapter < AbstractAdapter
+      def to_sql
+        "#{insert_sql} #{values_sql} #{on_duplicate_key_update};"
+      end
+
+      def on_duplicate_key_update
+        if @options[:handle_duplication]
+          "ON DUPLICATE KEY UPDATE #{on_duplicate_key_update_values}"
+        end
+      end
+
+      def on_duplicate_key_update_values
+        quoted_columns.map do |quoted_column|
+          "#{quoted_column}=#{quoted_column}"
+        end.join(',')
+      end
+    end
   end
 end

data/lib/mass_insert/version.rb

@@ -1,3 +1,3 @@
 module MassInsert
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/test/adapters/mysql2/example_test.rb

@@ -1,3 +1,29 @@
 require 'test_helper'
 
 shared_examples
+
+describe 'Database Adapters' do
+  let(:attributes) do
+    { name: 'Ruby' }
+  end
+
+  after :each do
+    Kind.delete_all
+  end
+
+  describe 'with duplicated record' do
+    def setup
+      Kind.mass_insert([attributes])
+    end
+
+    it 'does not raises error if is duplicated and has the duplication handler on' do
+      Kind.mass_insert([attributes], handle_duplication: true)
+    end
+
+    it 'raises error if is duplicated and does not have the duplication handler on' do
+      assert_raises ActiveRecord::RecordNotUnique do
+        Kind.mass_insert([attributes])
+      end
+    end
+  end
+end

data/test/database.yml.example

@@ -1,18 +1,20 @@
 common: &common
-  username: root
-  password:
   encoding: utf8
   database: mass_insert_test
 
-mysql2: &mysql2
+mysql2:
   <<: *common
   adapter: mysql2
+  username: #your_mysql_username
+  password: #your_mysql_password
 
-postgresql: &postgresql
+postgresql:
   <<: *common
-  username: postgres
   adapter: postgresql
+  username: #your_postgresql_username
+  password: #your_postgresql_password
 
-sqlite3: &sqlite3
+sqlite3:
+  <<: *common
   adapter: sqlite3
-  database: tmp/test.db
+  database: tmp/mass_insert_test.db

data/test/models/kind.rb

@@ -0,0 +1,2 @@
+class Kind < ActiveRecord::Base
+end

data/test/schema.rb

@@ -5,7 +5,11 @@ ActiveRecord::Schema.define do
     t.integer :age
     t.decimal :money, precision: 10, scale: 2
     t.date    :birth_date
-
     t.timestamps null: false
   end
+
+  create_table :kinds, force: true do |t|
+    t.string  :name
+    t.index ['name'], name: 'index_kinds_on_name', unique: true, using: :btree
+  end
 end

data/test/test_helper.rb

@@ -17,9 +17,19 @@ FileUtils.mkdir_p('log')
 
 ActiveRecord::Base.logger = Logger.new('log/test.log')
 ActiveRecord::Base.logger.level = Logger::DEBUG
-ActiveRecord::Base.configurations['test'] = YAML.load_file(File.dirname(__FILE__) + '/database.yml')[adapter]
+
+database_configuration = YAML.load_file(File.dirname(__FILE__) + '/database.yml')[adapter]
+ActiveRecord::Base.configurations['test'] = database_configuration
 ActiveRecord::Base.establish_connection(:test)
 
+begin
+  ActiveRecord::Base.connection
+rescue
+  # Ensures database exists.
+  ActiveRecord::Tasks::DatabaseTasks.database_configuration = database_configuration
+  ActiveRecord::Tasks::DatabaseTasks.create_current('test')
+end
+
 require File.dirname(__FILE__) + '/schema.rb'
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each{ |file| require file }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mass_insert
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Alejandro Gutiérrez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -111,6 +111,7 @@ files:
 - test/adapters/postgresql/example_test.rb
 - test/adapters/sqlite3/example_test.rb
 - test/database.yml.example
+- test/models/kind.rb
 - test/models/user.rb
 - test/schema.rb
 - test/support/adapters/mysql2.rb
@@ -147,6 +148,7 @@ test_files:
 - test/adapters/postgresql/example_test.rb
 - test/adapters/sqlite3/example_test.rb
 - test/database.yml.example
+- test/models/kind.rb
 - test/models/user.rb
 - test/schema.rb
 - test/support/adapters/mysql2.rb