atomically 1.1.2 → 1.1.3

data/Rakefile

@@ -1,10 +1,10 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
-end
-
-task default: :test
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task default: :test

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'atomically'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'atomically'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install --gemfile=gemfiles/4.2.gemfile
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install --gemfile=gemfiles/4.2.gemfile
+
+# Do any other automated setup that you need to do here

data/gemfiles/3.2.gemfile

@@ -1,16 +1,16 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 3.2.0'
-
-group :test do
-  gem 'mysql2', '0.3.21' if %w[mysql makara_mysql].include?(ENV['DB'])
-  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
-  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
-  gem 'simplecov'
-  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: '../'
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 3.2.0'
+
+group :test do
+  gem 'mysql2', '0.3.21' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
+  gem 'simplecov', '< 0.18'
+  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

@@ -1,16 +1,16 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.2.0'
-
-group :test do
-  gem 'mysql2', '0.3.21' if %w[mysql makara_mysql].include?(ENV['DB'])
-  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
-  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
-  gem 'simplecov'
-  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: '../'
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.2.0'
+
+group :test do
+  gem 'mysql2', '0.4.10' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
+  gem 'simplecov', '< 0.18'
+  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

@@ -1,16 +1,16 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 5.0.0'
-
-group :test do
-  gem 'mysql2', '0.3.21' if %w[mysql makara_mysql].include?(ENV['DB'])
-  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
-  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
-  gem 'simplecov'
-  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: '../'
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.0.0'
+
+group :test do
+  gem 'mysql2', '0.4.10' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
+  gem 'simplecov', '< 0.18'
+  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

@@ -1,16 +1,16 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 5.1.0'
-
-group :test do
-  gem 'mysql2', '0.3.21' if %w[mysql makara_mysql].include?(ENV['DB'])
-  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
-  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
-  gem 'simplecov'
-  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: '../'
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.1.0'
+
+group :test do
+  gem 'mysql2', '0.4.10' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
+  gem 'simplecov', '< 0.18'
+  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

@@ -1,16 +1,16 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 5.2.0'
-
-group :test do
-  gem 'mysql2', '0.5.1' if %w[mysql makara_mysql].include?(ENV['DB'])
-  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
-  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
-  gem 'simplecov'
-  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: '../'
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.2.0'
+
+group :test do
+  gem 'mysql2', '0.5.1' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
+  gem 'simplecov', '< 0.18'
+  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

@@ -1,15 +1,15 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 6.0.0'
-
-group :test do
-  gem 'mysql2', '0.5.1' if %w[mysql makara_mysql].include?(ENV['DB'])
-  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
-  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
-  gem 'simplecov'
-  gem 'pluck_all', '>= 2.0.4'
-  gem 'timecop', '~> 0.9.1'
-  gem 'update_all_scope', '~> 0.1.0'
-end
-
-gemspec path: '../'
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0'
+
+group :test do
+  gem 'mysql2', '0.5.1' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 1.4.6' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
+  gem 'simplecov', '< 0.18'
+  gem 'pluck_all', '>= 2.0.4'
+  gem 'timecop', '~> 0.9.1'
+  gem 'update_all_scope', '~> 0.1.0'
+end
+
+gemspec path: '../'

data/lib/atomically/active_record/extension.rb

@@ -1,20 +1,20 @@
-# frozen_string_literal: true
-
-require 'active_record'
-require 'atomically/query_service'
-
-class ActiveRecord::Relation
-  def atomically
-    Atomically::QueryService.new(klass, relation: self)
-  end
-end
-
-class ActiveRecord::Base
-  def self.atomically
-    Atomically::QueryService.new(self)
-  end
-
-  def atomically
-    Atomically::QueryService.new(self.class, model: self)
-  end
-end
+# frozen_string_literal: true
+
+require 'active_record'
+require 'atomically/query_service'
+
+class ActiveRecord::Relation
+  def atomically
+    Atomically::QueryService.new(klass, relation: self)
+  end
+end
+
+class ActiveRecord::Base
+  def self.atomically
+    Atomically::QueryService.new(self)
+  end
+
+  def atomically
+    Atomically::QueryService.new(self.class, model: self)
+  end
+end

data/lib/atomically/adapter_check_service.rb

@@ -1,30 +1,30 @@
-
-class Atomically::AdapterCheckService
-  def initialize(klass)
-    @klass = klass
-  end
-
-  def pg?
-    possible_pg_klasses.any?{|s| @klass.connection.is_a?(s) }
-  end
-
-  def mysql?
-    possible_mysql_klasses.any?{|s| @klass.connection.is_a?(s) }
-  end
-
-  private
-
-  def possible_pg_klasses
-    @possible_pg_klasses ||= [].tap do |result|
-      result << ActiveRecord::ConnectionAdapters::PostgreSQLAdapter if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-      result << ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter if defined?(ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter)
-    end
-  end
-
-  def possible_mysql_klasses
-    @possible_mysql_klasses ||= [].tap do |result|
-      result << ActiveRecord::ConnectionAdapters::Mysql2Adapter if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-      result << ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter if defined?(ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter)
-    end
-  end
-end
+
+class Atomically::AdapterCheckService
+  def initialize(klass)
+    @klass = klass
+  end
+
+  def pg?
+    possible_pg_klasses.any?{|s| @klass.connection.is_a?(s) }
+  end
+
+  def mysql?
+    possible_mysql_klasses.any?{|s| @klass.connection.is_a?(s) }
+  end
+
+  private
+
+  def possible_pg_klasses
+    @possible_pg_klasses ||= [].tap do |result|
+      result << ActiveRecord::ConnectionAdapters::PostgreSQLAdapter if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+      result << ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter if defined?(ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter)
+    end
+  end
+
+  def possible_mysql_klasses
+    @possible_mysql_klasses ||= [].tap do |result|
+      result << ActiveRecord::ConnectionAdapters::Mysql2Adapter if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+      result << ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter if defined?(ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter)
+    end
+  end
+end

data/lib/atomically/on_duplicate_sql_service.rb

@@ -1,28 +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
+# 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/patches/clear_attribute_changes.rb

@@ -1,17 +1,17 @@
-module ActiveModel
-  module Dirty
-    private
-
-    alias attributes_changed_by_setter changed_attributes # :nodoc:
-
-    # Force an attribute to have a particular "before" value
-    def set_attribute_was(attr, old_value)
-      attributes_changed_by_setter[attr] = old_value
-    end
-
-    # Remove changes information for the provided attributes.
-    def clear_attribute_changes(attributes) # :doc:
-      attributes_changed_by_setter.except!(*attributes)
-    end
-  end
-end
+module ActiveModel
+  module Dirty
+    private
+
+    alias attributes_changed_by_setter changed_attributes # :nodoc:
+
+    # Force an attribute to have a particular "before" value
+    def set_attribute_was(attr, old_value)
+      attributes_changed_by_setter[attr] = old_value
+    end
+
+    # Remove changes information for the provided attributes.
+    def clear_attribute_changes(attributes) # :doc:
+      attributes_changed_by_setter.except!(*attributes)
+    end
+  end
+end

data/lib/atomically/patches/from.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
-require 'active_record'
-
-class << ActiveRecord::Base
-  def from(value) # For Rails 3
-    value = "(#{value.to_sql}) subquery" if value.is_a?(ActiveRecord::Relation)
-    return super
-  end
-end
+# frozen_string_literal: true
+
+require 'active_record'
+
+class << ActiveRecord::Base
+  def from(value) # For Rails 3
+    value = "(#{value.to_sql}) subquery" if value.is_a?(ActiveRecord::Relation)
+    return super
+  end
+end

data/lib/atomically/patches/none.rb

@@ -1,9 +1,9 @@
-# frozen_string_literal: true
-
-require 'active_record'
-
-class << ActiveRecord::Base
-  def none # For Rails 3
-    where('1=0')
-  end
-end
+# frozen_string_literal: true
+
+require 'active_record'
+
+class << ActiveRecord::Base
+  def none # For Rails 3
+    where('1=0')
+  end
+end