diff options
| author | Jeremy Kemper <jeremykemper@gmail.com> | 2015-04-01 17:45:36 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremykemper@gmail.com> | 2015-04-01 17:45:36 -0700 |
| commit | a05f3e5f96f7a8aa55483d91becdbe49b81833fd (patch) | |
| tree | 2708205fb412b55f1dea947da22aaed47c1fd485 /activerecord/lib/active_record/connection_adapters | |
| parent | 4ba1376c608cc797c80402a73568744b1c855f67 (diff) | |
| parent | 58d75fd8112d27c0f4bdd004e10b4f4e8b350595 (diff) | |
| download | rails-a05f3e5f96f7a8aa55483d91becdbe49b81833fd.tar.gz rails-a05f3e5f96f7a8aa55483d91becdbe49b81833fd.tar.bz2 rails-a05f3e5f96f7a8aa55483d91becdbe49b81833fd.zip | |
Merge pull request #19616 from brainopia/speed_up_gsub
Prefer string patterns for gsub
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/quoting.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb index d2840b9498..91c7298983 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb @@ -77,7 +77,7 @@ module ActiveRecord # Quotes a string, escaping any ' (single quote) and \ (backslash) # characters. def quote_string(s) - s.gsub(/\\/, '\&\&').gsub(/'/, "''") # ' (for ruby-mode) + s.gsub('\\'.freeze, '\&\&'.freeze).gsub("'".freeze, "''".freeze) # ' (for ruby-mode) end # Quotes the column name. Defaults to no quoting. diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 00fc69c878..332ac9d88c 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -568,9 +568,9 @@ module ActiveRecord case default # Quoted types when /\A[\(B]?'(.*)'::/m - $1.gsub(/''/, "'") + $1.gsub("''".freeze, "'".freeze) # Boolean types - when 'true', 'false' + when 'true'.freeze, 'false'.freeze default # Numeric types when /\A\(?(-?\d+(\.\d*)?)\)?(::bigint)?\z/ |