From 1b86d90136efb98c7b331a84ca163587307a49af Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Thu, 17 May 2018 17:32:27 +0900
Subject: Enable `Performance/UnfreezeString` cop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In Ruby 2.3 or later, `String#+@` is available and `+@` is faster than `dup`.

```ruby
# frozen_string_literal: true

require "bundler/inline"

gemfile(true) do
  source "https://rubygems.org"

  gem "benchmark-ips"
end

Benchmark.ips do |x|
  x.report('+@') { +"" }
  x.report('dup') { "".dup }
  x.compare!
end
```

```
$ ruby -v benchmark.rb
ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-linux]
Warming up --------------------------------------
                  +@   282.289k i/100ms
                 dup   187.638k i/100ms
Calculating -------------------------------------
                  +@      6.775M (± 3.6%) i/s -     33.875M in   5.006253s
                 dup      3.320M (± 2.2%) i/s -     16.700M in   5.032125s

Comparison:
                  +@:  6775299.3 i/s
                 dup:  3320400.7 i/s - 2.04x  slower

```
---
 activerecord/lib/arel/collectors/plain_string.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib/arel/collectors')

diff --git a/activerecord/lib/arel/collectors/plain_string.rb b/activerecord/lib/arel/collectors/plain_string.rb
index 687d7fbf2f..c0e9fff399 100644
--- a/activerecord/lib/arel/collectors/plain_string.rb
+++ b/activerecord/lib/arel/collectors/plain_string.rb
@@ -4,7 +4,7 @@ module Arel # :nodoc: all
   module Collectors
     class PlainString
       def initialize
-        @str = "".dup
+        @str = +""
       end
 
       def value
-- 
cgit v1.2.3


From 09de7c91707b83a6c6ff8ab1a176cc1bf92ebb4d Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Sun, 30 Sep 2018 15:24:17 +0900
Subject: Use private attr_reader in Arel

No longer needed workaround for Ruby 2.2 "private attribute?" warning.

Related 6d63b5e49a399fe246afcebad45c3c962de268fa.
---
 activerecord/lib/arel/collectors/composite.rb        | 3 +--
 activerecord/lib/arel/collectors/substitute_binds.rb | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'activerecord/lib/arel/collectors')

diff --git a/activerecord/lib/arel/collectors/composite.rb b/activerecord/lib/arel/collectors/composite.rb
index d040d8598d..0533544993 100644
--- a/activerecord/lib/arel/collectors/composite.rb
+++ b/activerecord/lib/arel/collectors/composite.rb
@@ -24,8 +24,7 @@ module Arel # :nodoc: all
         [left.value, right.value]
       end
 
-      protected
-
+      private
         attr_reader :left, :right
     end
   end
diff --git a/activerecord/lib/arel/collectors/substitute_binds.rb b/activerecord/lib/arel/collectors/substitute_binds.rb
index 3f40eec8a8..4b894bc4b1 100644
--- a/activerecord/lib/arel/collectors/substitute_binds.rb
+++ b/activerecord/lib/arel/collectors/substitute_binds.rb
@@ -21,8 +21,7 @@ module Arel # :nodoc: all
         delegate.value
       end
 
-      protected
-
+      private
         attr_reader :quoter, :delegate
     end
   end
-- 
cgit v1.2.3


From 298629cefd845caf2cea28eb9cee2b538accc4ee Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Sun, 30 Sep 2018 16:41:43 +0900
Subject: `SQLString#compile` is no longer used since
 53521a9e39b9d8af4165d7703c36dc905f1f8f67

---
 activerecord/lib/arel/collectors/sql_string.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'activerecord/lib/arel/collectors')

diff --git a/activerecord/lib/arel/collectors/sql_string.rb b/activerecord/lib/arel/collectors/sql_string.rb
index c293a89a74..54e1e562c2 100644
--- a/activerecord/lib/arel/collectors/sql_string.rb
+++ b/activerecord/lib/arel/collectors/sql_string.rb
@@ -15,10 +15,6 @@ module Arel # :nodoc: all
         @bind_index += 1
         self
       end
-
-      def compile(bvs)
-        value
-      end
     end
   end
 end
-- 
cgit v1.2.3