atomically 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 920b276434066c1fd3d0172fe14ef28d818d17aaf8f7c4c5c12bff0554631daf
-  data.tar.gz: b89ddf56fbe003a5d54a085b66c46e854462eae6f40c28843b5c19f835bb7127
+SHA1:
+  metadata.gz: f11789d3b23462ec0a597434cbd71ad693684fb2
+  data.tar.gz: '0365791ed9e8a5f1b0d035a0db850cc8a5619983'
 SHA512:
-  metadata.gz: 15edd248d731a80e0e2797cc32fd046f224d0e094691ee3e3740923fb4372877b3041d7436c8685e658476959a5da7022519d2a83eb39c56345e491f14395221
-  data.tar.gz: aee6b53ff12ccf5424073746812b84f269f94e08bda83998f7b2ca60d7672b5a6c54e5053388b1ab14eca36b3041e7d3c2b90282c411caaa664e4b736810d75c
+  metadata.gz: 1bd013da03d5b05cb5dd98545f94cca224efa8815822b0ef1eed537bb1f2f5f5fe05fb82d9aa9fdfefb6c6f676e194a344c6a84254a999d7b3e6e69bc80badbc
+  data.tar.gz: 16335847dbb0540de93a43595a151324109539d9b6d6b728b885e7e83499c7293f6e4ecd5e81d34e41ce2279ab40f67cb10a19eba7529425a602ce4e5c39155f

data/.travis.yml

@@ -2,22 +2,30 @@ sudo: false
 language: ruby
 rvm:
   - 2.2
-  - 2.5
+  - 2.6
+services:
+  - mysql
+addons:
+  postgresql: "9.6"
 env:
   global:
     - CC_TEST_REPORTER_ID=12e1facab2e8910c9b9d6b9e6870c5544a5c44a1bef25cc6638fd132aa4af6b4
   matrix:
     - DB=mysql
+    - DB=pg
 gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
   - gemfiles/5.1.gemfile
   - gemfiles/5.2.gemfile
+  - gemfiles/6.0.gemfile
 matrix:
   exclude:
     - gemfile: gemfiles/3.2.gemfile
-      rvm: 2.5
+      rvm: 2.6
+    - gemfile: gemfiles/6.0.gemfile
+      rvm: 2.2
 before_install:
   - gem i rubygems-update -v '<3' && update_rubygems
   - gem install bundler -v 1.17.3
@@ -26,7 +34,10 @@ before_install:
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
 before_script:
+  - mysql -V
   - mysql -u root -e 'CREATE DATABASE travis_ci_test;'
+  - psql -c "SELECT version();"
+  - psql -c 'create database travis_ci_test;' -U postgres
 script:
   - bundle exec rake test
 after_script:

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change Log
 
+### [v1.0.6](https://github.com/khiav223577/atomically/compare/v1.0.5...v1.0.6) 2019/01/28
+- [#10](https://github.com/khiav223577/atomically/pull/10) `decrement_unsigned_counters` should be able to decrement the field to zero (@khiav223577)
+
 ### [v1.0.5](https://github.com/khiav223577/atomically/compare/v1.0.4...v1.0.5) 2019/01/28
 - [#9](https://github.com/khiav223577/atomically/pull/9) Implement `decrement_unsigned_counters` (@khiav223577)
 - [#8](https://github.com/khiav223577/atomically/pull/8) Fix: broken test cases after bundler 2.0 was released (@khiav223577)

data/README.md

@@ -8,14 +8,17 @@
 
 `atomically` is a Ruby Gem for you to write atomic query with ease.
 
-Supports Rails 3.2, 4.2, 5.0, 5.1, 5.2.
+All methods are defined in `Atomically::QueryService` instead of defining in `ActiveRecord` directly, in order not to pollute the model instance.
+
+- Supports Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0.
+- Supports PostgreSQL, MySQL.
 
 ## Table of contents
 
 1. [Installation](#installation)
 2. [Methods](#methods)
    - Relation Methods
-     - [create_or_plus](#create_or_plus-columns-values-on_duplicate_update_columns)
+     - [create_or_plus](#create_or_plus-columns-values-on_duplicate_update_columns-conflict_target)
      - [pay_all](#pay_all-hash-update_columns-primary_key-id)
      - [update_all](#update_all-expected_number-updates)
      - [update_all_and_get_ids](#update_all_and_get_ids-updates)
@@ -46,19 +49,35 @@ Or install it yourself as:
 
 Note: ActiveRecord validations and callbacks will **NOT** be triggered when calling below methods.
 
-### create_or_plus _(columns, values, on_duplicate_update_columns)_
+### create_or_plus _(columns, values, on_duplicate_update_columns, conflict_target:)_
 
 Import an array of records. When key is duplicate, plus the old value with new value.
-It is useful to add `items` to `user` when `user_items` may not exist.
+It is useful to add `items` to `user` when `user_items` may not exist. (Let `User` and `Item` are many-to-many relationship.)
 
 #### Parameters
 
   - First two args (`columns`, `values`) are the same with the [import](https://github.com/zdennis/activerecord-import#columns-and-arrays) method.
   - `on_duplicate_update_columns` - The column that will be updated on duplicate.
+  - `conflict_target` - Needed only in pg. Specifies which columns have unique index.
 
 #### Example
 
 ```rb
+class User < ApplicationRecord
+  has_many :user_items
+  has_many :items, through: :user_items
+end
+
+class UserItem < ApplicationRecord
+  belongs_to :user
+  belongs_to :item
+end
+
+class Item < ApplicationRecord
+  has_many :user_items
+  has_many :users, through: :user_items
+end
+
 user = User.find(2)
 item1 = Item.find(1)
 item2 = Item.find(2)
@@ -67,44 +86,59 @@ item2 = Item.find(2)
 ```rb
 columns = [:user_id, :item_id, :quantity]
 values = [[user.id, item1.id, 3], [user.id, item2.id, 2]]
-on_duplicate_update_columns = [:quantity]
 
-UserItem.atomically.create_or_plus(columns, values, on_duplicate_update_columns)
+# mysql
+UserItem.atomically.create_or_plus(columns, values, [:quantity])
+
+# pg
+UserItem.atomically.create_or_plus(columns, values, [:quantity], conflict_target: [:user_id, :item_id])
 ```
 
 before
 
-![before](https://user-images.githubusercontent.com/4011729/48998921-ff430600-f18f-11e8-8eeb-e8a71bbf5802.png)
+![before](https://user-images.githubusercontent.com/4011729/67365648-95e89480-f5a4-11e9-8147-279385c6f442.png)
 
 after
 
-![image](https://user-images.githubusercontent.com/4011729/48999092-8d1ef100-f190-11e8-8372-86e2e99cbe08.png)
+![after](https://user-images.githubusercontent.com/4011729/67365653-97b25800-f5a4-11e9-8314-8e6ff8d2cd61.png)
+
 
 #### SQL queries
 
 ```sql
+# mysql
 INSERT INTO `user_items` (`user_id`,`item_id`,`quantity`,`created_at`,`updated_at`) VALUES
   (2,1,3,'2018-11-27 03:44:25','2018-11-27 03:44:25'),
   (2,2,2,'2018-11-27 03:44:25','2018-11-27 03:44:25')
-ON DUPLICATE KEY UPDATE `quantity` = `quantity` + VALUES(`quantity`)
+ON DUPLICATE KEY UPDATE
+  `quantity` = `quantity` + VALUES(`quantity`)
+
+# pg
+INSERT INTO "user_items" ("user_id","item_id","quantity","created_at","updated_at") VALUES
+  (2,1,3,'2018-11-27 03:44:25.847909','2018-11-27 03:44:25.847909'),
+  (2,2,2,'2018-11-27 03:44:25.847909','2018-11-27 03:44:25.847909')
+ON CONFLICT (user_id, item_id) DO UPDATE SET
+  "quantity" = "user_items"."quantity" + excluded."quantity"  RETURNING "id"
 ```
 
 ---
 ### pay_all _(hash, update_columns, primary_key: :id)_
 
-Reduce the quantity of items and return how many rows and updated if all of them is enough.
+Reduce the quantity of items and return how many rows and updated if all of them are enough.
 Do nothing and return zero if any of them is not enough.
 
 #### Parameters
 
   - `hash` - A hash contains the id of the models as keys and the amount to update the field by as values.
   - `update_columns` - The column that will be updated.
-  - `primary_key` - Specify the column that `id`(the key of hash) refer to.
+  - `primary_key` - Specify the column that `id`(the key of hash) refers to.
 
 #### Example
 
 ```rb
 user.user_items.atomically.pay_all({ item1.id => 4, item2.id => 3 }, [:quantity], primary_key: :item_id)
+# => 2 (if success)
+# => 0 (if some aren't enough)
 ```
 
 #### SQL queries
@@ -141,21 +175,21 @@ Behaves like [ActiveRecord::Relation#update_all](https://apidock.com/rails/Activ
 
 #### Examples
 ```rb
-User.where(id: [1, 2]).atomically.update_all(2, name: '')
-# => 2
+User.where(id: [5, 6]).atomically.update_all(2, name: '')
+# => 2 (success)
 
-User.where(id: [1, 2, 3]).atomically.update_all(2, name: '')
-# => 0
+User.where(id: [7, 8, 9]).atomically.update_all(2, name: '')
+# => 0 (fail)
 ```
 
 #### SQL queries
 
 ```sql
-# User.where(id: [1, 2, 3]).atomically.update_all(2, name: '')
-UPDATE `users` SET `users`.`name` = '' WHERE `users`.`id` IN (1, 2, 3) AND (
+# User.where(id: [7, 8, 9]).atomically.update_all(2, name: '')
+UPDATE `users` SET `users`.`name` = '' WHERE `users`.`id` IN (7, 8, 9) AND (
   (
     SELECT COUNT(*) FROM (
-      SELECT `users`.* FROM `users` WHERE `users`.`id` IN (1, 2, 3)
+      SELECT `users`.* FROM `users` WHERE `users`.`id` IN (7, 8, 9)
     ) subquery
   ) = 2
 )
@@ -164,7 +198,7 @@ UPDATE `users` SET `users`.`name` = '' WHERE `users`.`id` IN (1, 2, 3) AND (
 ---
 ### update_all_and_get_ids _(updates)_
 
-Behaves like [ActiveRecord::Relation#update_all](https://apidock.com/rails/ActiveRecord/Relation/update_all), but return the ids array of updated records instead of the number of updated records.
+Behaves like [ActiveRecord::Relation#update_all](https://apidock.com/rails/ActiveRecord/Relation/update_all), but return an array of updated records' id instead of the number of updated records.
 
 
 #### Parameters
@@ -175,23 +209,32 @@ Behaves like [ActiveRecord::Relation#update_all](https://apidock.com/rails/Activ
 
 ```rb
 User.where(account: ['moon', 'wolf']).atomically.update_all_and_get_ids('money = money + 1')
-# => [254, 371]
+# => [254, 371] (array of updated user ids)
+
+User.where(account: ['moon', 'wolf']).update_all('money = money + 1')
+# => 2 (the number of updated records)
 ```
 
 #### SQL queries
 
 ```sql
+# mysql
 BEGIN
   SET @ids := NULL
   UPDATE `users` SET money = money + 1 WHERE `users`.`account` IN ('moon', 'wolf') AND ((SELECT @ids := CONCAT_WS(',', `users`.`id`, @ids)))
   SELECT @ids FROM DUAL
 COMMIT
+
+# pg
+UPDATE 'users' SET money = money + 1 RETURNING id
 ```
 
 ---
 ### update _(attrs, from: :not_set)_
 
-Updates the attributes of the model from the passed-in hash and saves the record. The difference between this method and [ActiveRecord#update](https://apidock.com/rails/ActiveRecord/Persistence/update) is that it will add extra WHERE conditions to prevent race condition.
+Updates the attributes of the model from the passed-in hash and saves the record. Return true if update successfully, false otherwise. This method can detect race condition and make sure the model is updated only once.
+
+The difference between this method and [ActiveRecord#update](https://apidock.com/rails/ActiveRecord/Persistence/update) is that it will add extra WHERE conditions to prevent race condition.
 
 #### Parameters
 
@@ -212,11 +255,30 @@ class Arena < ApplicationRecord
 end
 ```
 
+Let `arena.closed_at` be nil.
+
+```rb
+arena.atomically_close!
+# => true (if success)
+# => false (if race condition occurs)
+```
+
+The return value can be used to prevent race condition and make sure some piece of code is executed once.
+
+```rb
+if arena.atomically_close!
+  # Only one request can pass this check and excete the code here.
+  # You can send rewards, calculate ranking, or fire background job here.
+  # No need to worry about being invoked multiple times.
+  do_something
+end
+```
+
 #### SQL queries
 
+
 ```sql
 # arena.atomically_close!
-# (let arena.closed_at to be nil)
 UPDATE `arenas` SET `arenas`.`closed_at` = '2018-11-27 03:44:25', `updated_at` = '2018-11-27 03:44:25'
 WHERE `arenas`.`id` = 1752 AND `arenas`.`closed_at` IS NULL
 
@@ -244,12 +306,12 @@ user.money
 # => 100
 
 user.atomically.decrement_unsigned_counters(money: 10)
-# => true
+# => true (success)
 user.reload.money
 # => 90
 
 user.atomically.decrement_unsigned_counters(money: 999)
-# => false
+# => false (fail)
 user.reload.money
 # => 90
 ```
@@ -258,7 +320,7 @@ user.reload.money
 
 ```sql
 # user.atomically.decrement_unsigned_counters(money: 140)
-UPDATE `users` SET money = money - 140 WHERE `users`.`id` = 1 AND (money > 140)
+UPDATE `users` SET money = money - 140 WHERE `users`.`id` = 1 AND (money >= 140)
 ```
 
 ## Development

data/atomically.gemspec

@@ -26,16 +26,25 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.metadata      = {
+    'homepage_uri'      => 'https://github.com/khiav223577/atomically',
+    'changelog_uri'     => 'https://github.com/khiav223577/atomically/blob/master/CHANGELOG.md',
+    'source_code_uri'   => 'https://github.com/khiav223577/atomically',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/atomically',
+    'bug_tracker_uri'   => 'https://github.com/khiav223577/atomically/issues',
+  }
 
   spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'mysql2', '>= 0.3'
+  spec.add_development_dependency "pg", "~> 0.18"
   spec.add_development_dependency 'pluck_all', '>= 2.0.3'
   spec.add_development_dependency 'timecop', '~> 0.9.1'
 
   spec.add_dependency 'activerecord', '>= 3'
   spec.add_dependency 'activerecord-import', '>= 0.27.0'
   spec.add_dependency 'rails_or', '>= 1.1.8'
+  spec.add_dependency 'update_all_scope', '~> 0.1.0'
 end

data/gemfiles/3.2.gemfile

@@ -8,9 +8,10 @@ group :test do
   when 'postgres' ; gem 'pg', '~> 0.18'
   end
   gem 'simplecov'
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
+  gem 'i18n', '< 1.6'
   gem 'pluck_all', '>= 2.0.3'
   gem 'timecop', '~> 0.9.1'
+  gem 'update_all_scope', '~> 0.1.0'
 end
 
 gemspec path: '../'

data/gemfiles/4.2.gemfile

@@ -8,9 +8,10 @@ group :test do
   when 'postgres' ; gem 'pg', '~> 0.18'
   end
   gem 'simplecov'
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
+  gem 'i18n', '< 1.6'
   gem 'pluck_all', '>= 2.0.3'
   gem 'timecop', '~> 0.9.1'
+  gem 'update_all_scope', '~> 0.1.0'
 end
 
 gemspec path: '../'

data/gemfiles/5.0.gemfile

@@ -8,9 +8,10 @@ group :test do
   when 'postgres' ; gem 'pg', '~> 0.18'
   end
   gem 'simplecov'
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
+  gem 'i18n', '< 1.6'
   gem 'pluck_all', '>= 2.0.3'
   gem 'timecop', '~> 0.9.1'
+  gem 'update_all_scope', '~> 0.1.0'
 end
 
 gemspec path: '../'

data/gemfiles/5.1.gemfile

@@ -8,9 +8,10 @@ group :test do
   when 'postgres' ; gem 'pg', '~> 0.18'
   end
   gem 'simplecov'
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
+  gem 'i18n', '< 1.6'
   gem 'pluck_all', '>= 2.0.3'
   gem 'timecop', '~> 0.9.1'
+  gem 'update_all_scope', '~> 0.1.0'
 end
 
 gemspec path: '../'

data/gemfiles/5.2.gemfile

@@ -8,9 +8,10 @@ group :test do
   when 'postgres' ; gem 'pg', '~> 0.18'
   end
   gem 'simplecov'
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
+  gem 'i18n', '< 1.6'
   gem 'pluck_all', '>= 2.0.3'
   gem 'timecop', '~> 0.9.1'
+  gem 'update_all_scope', '~> 0.1.0'
 end
 
 gemspec path: '../'

data/gemfiles/6.0.gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0'
+
+group :test do
+  case ENV['DB']
+  when 'mysql'    ; gem 'mysql2', '0.5.1'
+  when 'postgres' ; gem 'pg', '~> 0.18'
+  end
+  gem 'simplecov'
+  gem 'pluck_all', '>= 2.0.4'
+  gem 'timecop', '~> 0.9.1'
+  gem 'update_all_scope', '~> 0.1.0'
+end
+
+gemspec path: '../'

data/lib/atomically/adapter_check_service.rb

@@ -0,0 +1,16 @@
+
+class Atomically::AdapterCheckService
+  def initialize(klass)
+    @klass = klass
+  end
+
+  def pg?
+    return false if not defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+    return @klass.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+  end
+
+  def mysql?
+    return false if not defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+    return @klass.connection.is_a?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+  end
+end

data/lib/atomically/on_duplicate_sql_service.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Atomically::OnDuplicateSqlService
+  def initialize(klass, columns)
+    @klass = klass
+    @columns = columns
+  end
+
+  def mysql_quote_columns_for_plus
+    return @columns.map do |column|
+      quoted_column = quote_column(column)
+      next "#{quoted_column} = #{quoted_column} + VALUES(#{quoted_column})"
+    end
+  end
+
+  def pg_quote_columns_for_plus
+    return @columns.map do |column|
+      quoted_column = quote_column(column)
+      next "#{quoted_column} = #{@klass.quoted_table_name}.#{quoted_column} + excluded.#{quoted_column}"
+    end
+  end
+
+  private
+
+  def quote_column(column)
+    @klass.connection.quote_column_name(column)
+  end
+end

data/lib/atomically/query_service.rb

@@ -2,20 +2,24 @@
 
 require 'activerecord-import'
 require 'rails_or'
-require 'atomically/update_all_scope'
+require 'update_all_scope'
+require 'atomically/on_duplicate_sql_service'
+require 'atomically/adapter_check_service'
 require 'atomically/patches/clear_attribute_changes' if not ActiveModel::Dirty.method_defined?(:clear_attribute_changes) and not ActiveModel::Dirty.private_method_defined?(:clear_attribute_changes)
 require 'atomically/patches/none' if not ActiveRecord::Base.respond_to?(:none)
 require 'atomically/patches/from' if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0')
 
 class Atomically::QueryService
+  DEFAULT_CONFLICT_TARGETS = [:id].freeze
+
   def initialize(klass, relation: nil, model: nil)
     @klass = klass
     @relation = relation || @klass
     @model = model
   end
 
-  def create_or_plus(columns, data, update_columns)
-    @klass.import(columns, data, on_duplicate_key_update: on_duplicate_key_plus_sql(update_columns))
+  def create_or_plus(columns, data, update_columns, conflict_target: DEFAULT_CONFLICT_TARGETS)
+    @klass.import(columns, data, on_duplicate_key_update: on_duplicate_key_plus_sql(update_columns, conflict_target))
   end
 
   def pay_all(hash, update_columns, primary_key: :id) # { id => pay_count }
@@ -30,8 +34,13 @@ class Atomically::QueryService
     end
 
     raw_when_sql = hash.map{|id, pay_count| "WHEN #{sanitize(id)} THEN #{sanitize(-pay_count)}" }.join("\n")
+    no_var_in_sql = true if update_columns.size == 1 or db_is_pg?
     update_sqls = update_columns.map.with_index do |column, idx|
-      value = idx == 0 ? "(@change := \nCASE #{quote_column(primary_key)}\n#{raw_when_sql}\nEND)" : '@change'
+      if no_var_in_sql
+        value = "(\nCASE #{quote_column(primary_key)}\n#{raw_when_sql}\nEND)"
+      else
+        value = idx == 0 ? "(@change := \nCASE #{quote_column(primary_key)}\n#{raw_when_sql}\nEND)" : '@change'
+      end
       next "#{column} = #{column} + #{value}"
     end
 
@@ -62,20 +71,43 @@ class Atomically::QueryService
   end
 
   def update_all_and_get_ids(*args)
+    if db_is_pg?
+      scope = UpdateAllScope::UpdateAllScope.new(model: @model, relation: @relation.where(''))
+      scope.update(*args)
+      return @klass.connection.execute("#{scope.to_sql} RETURNING id", "#{@klass} Update All").map{|s| s['id'].to_i }
+    end
+
     ids = nil
-    id_column = "#{@klass.quoted_table_name}.#{quote_column(:id)}"
+    id_column = quote_column_with_table(:id)
     @klass.transaction do
       @relation.connection.execute('SET @ids := NULL')
       @relation.where("(SELECT @ids := CONCAT_WS(',', #{id_column}, @ids))").update_all(*args) # 撈出有真的被更新的 id，用逗號串在一起
-      ids = @klass.from(nil).pluck('@ids').first
+      ids = @klass.from(nil).pluck(Arel.sql('@ids')).first
     end
     return ids.try{|s| s.split(',').map(&:to_i).uniq.sort } || [] # 將 id 從字串取出來 @id 的格式範例: '1,4,12'
   end
 
   private
 
-  def on_duplicate_key_plus_sql(columns)
-    columns.lazy.map(&method(:quote_column)).map{|s| "#{s} = #{s} + VALUES(#{s})" }.force.join(', ')
+  def db_is_pg?
+    Atomically::AdapterCheckService.new(@klass).pg?
+  end
+
+  def db_is_mysql?
+    Atomically::AdapterCheckService.new(@klass).mysql?
+  end
+
+  def on_duplicate_key_plus_sql(columns, conflict_target)
+    service = Atomically::OnDuplicateSqlService.new(@klass, columns)
+    return service.mysql_quote_columns_for_plus.join(', ') if db_is_mysql?
+    return {
+      conflict_target: conflict_target,
+      columns: service.pg_quote_columns_for_plus.join(', ')
+    }
+  end
+
+  def quote_column_with_table(column)
+    "#{@klass.quoted_table_name}.#{quote_column(column)}"
   end
 
   def quote_column(column)
@@ -103,7 +135,7 @@ class Atomically::QueryService
 
   def open_update_all_scope(&block)
     return 0 if @model == nil
-    scope = UpdateAllScope.new(model: @model)
+    scope = UpdateAllScope::UpdateAllScope.new(model: @model)
     scope.instance_exec(&block)
     return scope.do_query!
   end

data/lib/atomically/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Atomically
-  VERSION = '1.0.6'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atomically
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: pluck_all
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.8
+- !ruby/object:Gem::Dependency
+  name: update_all_scope
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Adds commonly useful atomic SQL statements to ActiveRecord to avoid race
   condition.
 email:
@@ -169,7 +197,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Gemfile.gemfile
 - LICENSE
 - LICENSE.txt
 - README.md
@@ -182,18 +209,25 @@ files:
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
 - lib/atomically.rb
 - lib/atomically/active_record/extension.rb
+- lib/atomically/adapter_check_service.rb
+- lib/atomically/on_duplicate_sql_service.rb
 - lib/atomically/patches/clear_attribute_changes.rb
 - lib/atomically/patches/from.rb
 - lib/atomically/patches/none.rb
 - lib/atomically/query_service.rb
-- lib/atomically/update_all_scope.rb
 - lib/atomically/version.rb
 homepage: https://github.com/khiav223577/atomically
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/khiav223577/atomically
+  changelog_uri: https://github.com/khiav223577/atomically/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/khiav223577/atomically
+  documentation_uri: https://www.rubydoc.info/gems/atomically
+  bug_tracker_uri: https://github.com/khiav223577/atomically/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -210,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Adds commonly useful atomic SQL statements to ActiveRecord to avoid race

data/Gemfile.gemfile

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rails_or.gemspec
-
-gem 'activerecord', '~> 5.0'
-
-group :test do
-  gem 'simplecov'
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
-end
-
-gemspec path: '../'

data/lib/atomically/update_all_scope.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-class UpdateAllScope
-  def initialize(model: nil, relation: nil)
-    @queries = []
-    @relation = relation || model.class.where(id: model.id)
-  end
-
-  def where(*args)
-    @relation = @relation.where(*args)
-    return self
-  end
-
-  def update(query, *binding_values)
-    args = binding_values.size > 0 ? [[query, *binding_values]] : [query]
-    @queries << klass.send(:sanitize_sql_for_assignment, *args)
-    return self
-  end
-
-  def do_query!
-    return 0 if @queries.empty?
-    return @relation.update_all(@queries.join(','))
-  end
-
-  def klass
-    @relation.klass
-  end
-end