atomically 1.1.2 → 1.1.3

data/lib/atomically/query_service.rb

@@ -1,153 +1,154 @@
-# frozen_string_literal: true
-
-require 'activerecord-import'
-require 'rails_or'
-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, 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 }
-    return 0 if hash.blank?
-
-    update_columns = update_columns.map(&method(:quote_column))
-
-    query = hash.inject(@klass.none) do |relation, (id, pay_count)|
-      condition = @relation.where(primary_key => id)
-      update_columns.each{|s| condition = condition.where("#{s} >= ?", pay_count) }
-      next relation.or(condition)
-    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 adapter_check_service.pg?
-    update_sqls = update_columns.map.with_index do |column, idx|
-      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
-
-    return where_all_can_be_updated(query, hash.size).update_all(update_sqls.join(', '))
-  end
-
-  def update_all(expected_size, *args)
-    where_all_can_be_updated(@relation, expected_size).update_all(*args)
-  end
-
-  def update(attrs, from: :not_set)
-    success = update_and_return_number_of_updated_rows(attrs, from) == 1
-
-    if success
-      assign_without_changes(attrs)
-      @model.send(:clear_attribute_changes, @model.changes.keys)
-    end
-
-    return success
-  end
-
-  # ==== Parameters
-  #
-  # * +counters+ - A Hash containing the names of the fields
-  #   to update as keys and the amount to update the field by as values.
-  def decrement_unsigned_counters(counters)
-    result = open_update_all_scope do
-      counters.each do |field, amount|
-        where("#{field} >= ?", amount).update("#{field} = #{field} - ?", amount) if amount > 0
-      end
-    end
-    return (result == 1)
-  end
-
-  def update_all_and_get_ids(*args)
-    if adapter_check_service.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 = 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(Arel.sql('@ids')).first
-    end
-    return ids.try{|s| s.split(',').map(&:to_i).uniq.sort } || [] # 將 id 從字串取出來 @id 的格式範例: '1,4,12'
-  end
-
-  private
-
-  def adapter_check_service
-    @adapter_check_service ||= Atomically::AdapterCheckService.new(@klass)
-  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 adapter_check_service.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)
-    @klass.connection.quote_column_name(column)
-  end
-
-  def sanitize(value)
-    @klass.connection.quote(value)
-  end
-
-  def where_all_can_be_updated(query, expected_size)
-    query.where("(#{@klass.from(query.where('')).select('COUNT(*)').to_sql}) = ?", expected_size)
-  end
-
-  def update_and_return_number_of_updated_rows(attrs, from_value)
-    model = @model
-    return open_update_all_scope do
-      update(updated_at: Time.now)
-
-      model.changes.each do |column, (_old_value, new_value)|
-        update(column => new_value)
-      end
-
-      attrs.each do |column, value|
-        old_value = (from_value == :not_set ? model[column] : from_value)
-        where(column => old_value).update(column => value) if old_value != value
-      end
-    end
-  end
-
-  def open_update_all_scope(&block)
-    return 0 if @model == nil
-    scope = UpdateAllScope::UpdateAllScope.new(model: @model)
-    scope.instance_exec(&block)
-    return scope.do_query!
-  end
-
-  def assign_without_changes(attributes)
-    @model.assign_attributes(attributes)
-    @model.send(:clear_attribute_changes, attributes.keys)
-  end
-end
+# frozen_string_literal: true
+
+require 'activerecord-import'
+require 'rails_or'
+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, 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 }
+    return 0 if hash.blank?
+
+    update_columns = update_columns.map(&method(:quote_column))
+
+    query = hash.inject(@klass.none) do |relation, (id, pay_count)|
+      condition = @relation.where(primary_key => id)
+      update_columns.each{|s| condition = condition.where("#{s} >= ?", pay_count) }
+      next relation.or(condition)
+    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 adapter_check_service.pg?
+    update_sqls = update_columns.map.with_index do |column, idx|
+      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
+
+    return where_all_can_be_updated(query, hash.size).update_all(update_sqls.join(', '))
+  end
+
+  def update_all(expected_size, *args)
+    where_all_can_be_updated(@relation, expected_size).update_all(*args)
+  end
+
+  def update(attrs, options = {})
+    from = options[:from] || :not_set
+    success = update_and_return_number_of_updated_rows(attrs, from) == 1
+
+    if success
+      assign_without_changes(attrs)
+      @model.send(:clear_attribute_changes, @model.changes.keys)
+    end
+
+    return success
+  end
+
+  # ==== Parameters
+  #
+  # * +counters+ - A Hash containing the names of the fields
+  #   to update as keys and the amount to update the field by as values.
+  def decrement_unsigned_counters(counters)
+    result = open_update_all_scope do
+      counters.each do |field, amount|
+        where("#{field} >= ?", amount).update("#{field} = #{field} - ?", amount) if amount > 0
+      end
+    end
+    return (result == 1)
+  end
+
+  def update_all_and_get_ids(*args)
+    if adapter_check_service.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 = 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(Arel.sql('@ids')).first
+    end
+    return ids.try{|s| s.split(',').map(&:to_i).uniq.sort } || [] # 將 id 從字串取出來 @id 的格式範例: '1,4,12'
+  end
+
+  private
+
+  def adapter_check_service
+    @adapter_check_service ||= Atomically::AdapterCheckService.new(@klass)
+  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 adapter_check_service.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)
+    @klass.connection.quote_column_name(column)
+  end
+
+  def sanitize(value)
+    @klass.connection.quote(value)
+  end
+
+  def where_all_can_be_updated(query, expected_size)
+    query.where("(#{@klass.from(query.where('')).select('COUNT(*)').to_sql}) = ?", expected_size)
+  end
+
+  def update_and_return_number_of_updated_rows(attrs, from_value)
+    model = @model
+    return open_update_all_scope do
+      update(updated_at: Time.now)
+
+      model.changes.each do |column, (_old_value, new_value)|
+        update(column => new_value)
+      end
+
+      attrs.each do |column, value|
+        old_value = (from_value == :not_set ? model[column] : from_value)
+        where(column => old_value).update(column => value) if old_value != value
+      end
+    end
+  end
+
+  def open_update_all_scope(&block)
+    return 0 if @model == nil
+    scope = UpdateAllScope::UpdateAllScope.new(model: @model)
+    scope.instance_exec(&block)
+    return scope.do_query!
+  end
+
+  def assign_without_changes(attributes)
+    @model.assign_attributes(attributes)
+    @model.send(:clear_attribute_changes, attributes.keys)
+  end
+end

data/lib/atomically/version.rb

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

data/lib/atomically.rb

@@ -1,7 +1,7 @@
-# frozen_string_literal: true
-
-require 'atomically/version'
-require 'atomically/active_record/extension'
-
-module Atomically
-end
+# frozen_string_literal: true
+
+require 'atomically/version'
+require 'atomically/active_record/extension'
+
+module Atomically
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atomically
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2023-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,9 +192,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.14
 signing_key: 
 specification_version: 4
 summary: An ActiveRecord extension for writing commonly useful atomic SQL statements

data/.travis.yml

@@ -1,65 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.2
-  - 2.6
-  - 2.7
-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:
-  include:
-    - env: DB=makara_mysql
-      gemfile: gemfiles/6.0.gemfile
-      rvm: 2.6
-    - env: DB=makara_pg
-      gemfile: gemfiles/6.0.gemfile
-      rvm: 2.6
-    - env: DB=makara_mysql
-      gemfile: gemfiles/6.0.gemfile
-      rvm: 2.7
-    - env: DB=makara_pg
-      gemfile: gemfiles/6.0.gemfile
-      rvm: 2.7
-  exclude:
-    - gemfile: gemfiles/3.2.gemfile
-      rvm: 2.6
-    - gemfile: gemfiles/3.2.gemfile
-      rvm: 2.7
-    - gemfile: gemfiles/4.2.gemfile
-      rvm: 2.7
-    - gemfile: gemfiles/6.0.gemfile
-      rvm: 2.2
-before_install:
-  - if `ruby -e 'exit(RUBY_VERSION.to_f < 2.7)'`; then
-      gem i rubygems-update -v '< 3' && update_rubygems;
-      gem install bundler -v '< 2';
-    fi
-  - gem --version
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - 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:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-