aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-06-09 14:03:31 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-06-09 14:14:10 +0900
commit1340498d2102423665cc5cfe7be7cdba32c72928 (patch)
tree9067d11ca44f28919e55918e1fb5ef48f13eca0f /activerecord/lib/active_record/connection_adapters
parent3567fa53f7dada3f5c66f4e72775f8bfa9f38f80 (diff)
downloadrails-1340498d2102423665cc5cfe7be7cdba32c72928.tar.gz
rails-1340498d2102423665cc5cfe7be7cdba32c72928.tar.bz2
rails-1340498d2102423665cc5cfe7be7cdba32c72928.zip
Refactor `disallow_raw_sql!` to avoid `split(/\s*,\s*/)` to order args
`split(/\s*,\s*/)` to order args and then `permit.match?` one by one is much slower than `permit.match?` once.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/quoting.rb19
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/quoting.rb17
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb20
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb17
4 files changed, 54 insertions, 19 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index 99e1a11f30..a1b91c22de 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -155,7 +155,14 @@ module ActiveRecord
#
# "#{table_name}.#{column_name}"
# "#{column_name}"
- COLUMN_NAME = /\A(?:\w+\.)?\w+\z/i
+ COLUMN_NAME = /
+ \A
+ (
+ (?:\w+\.)?\w+
+ )
+ (?:\s*,\s*\g<1>)*
+ \z
+ /ix
# Regexp for column names with order (with or without a table name prefix,
# with or without various order modifiers). Matches the following:
@@ -170,10 +177,12 @@ module ActiveRecord
# "#{column_name} NULLS LAST"
COLUMN_NAME_WITH_ORDER = /
\A
- (?:\w+\.)?
- \w+
- (?:\s+ASC|\s+DESC)?
- (?:\s+NULLS\s+(?:FIRST|LAST))?
+ (
+ (?:\w+\.)?\w+
+ (?:\s+ASC|\s+DESC)?
+ (?:\s+NULLS\s+(?:FIRST|LAST))?
+ )
+ (?:\s*,\s*\g<1>)*
\z
/ix
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb b/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
index 84354c0187..740832d6b8 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
@@ -40,13 +40,22 @@ module ActiveRecord
COLUMN_NAME_WITH_ORDER
end
- COLUMN_NAME = /\A(?:(`?)\w+\k<1>\.)?(`?)\w+\k<2>\z/i
+ COLUMN_NAME = /
+ \A
+ (
+ (?:\w+\.|`\w+`\.)?(?:\w+|`\w+`)
+ )
+ (?:\s*,\s*\g<1>)*
+ \z
+ /ix
COLUMN_NAME_WITH_ORDER = /
\A
- (?:(`?)\w+\k<1>\.)?
- (`?)\w+\k<2>
- (?:\s+ASC|\s+DESC)?
+ (
+ (?:\w+\.|`\w+`\.)?(?:\w+|`\w+`)
+ (?:\s+ASC|\s+DESC)?
+ )
+ (?:\s*,\s*\g<1>)*
\z
/ix
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
index 0ebed21717..095429dd89 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -86,15 +86,23 @@ module ActiveRecord
COLUMN_NAME_WITH_ORDER
end
- COLUMN_NAME = /\A(?:("?)\w+\k<1>\.)?("?)\w+\k<2>(?:::\w+)?\z/i
+ COLUMN_NAME = /
+ \A
+ (
+ (?:\w+\.|"\w+"\.)?(?:\w+|"\w+")(?:::\w+)?
+ )
+ (?:\s*,\s*\g<1>)*
+ \z
+ /ix
COLUMN_NAME_WITH_ORDER = /
\A
- (?:("?)\w+\k<1>\.)?
- ("?)\w+\k<2>
- (?:::\w+)?
- (?:\s+ASC|\s+DESC)?
- (?:\s+NULLS\s+(?:FIRST|LAST))?
+ (
+ (?:\w+\.|"\w+"\.)?(?:\w+|"\w+")(?:::\w+)?
+ (?:\s+ASC|\s+DESC)?
+ (?:\s+NULLS\s+(?:FIRST|LAST))?
+ )
+ (?:\s*,\s*\g<1>)*
\z
/ix
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb b/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
index 79d477cdb2..88a16599f7 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
@@ -53,13 +53,22 @@ module ActiveRecord
COLUMN_NAME_WITH_ORDER
end
- COLUMN_NAME = /\A(?:("?)\w+\k<1>\.)?("?)\w+\k<2>\z/i
+ COLUMN_NAME = /
+ \A
+ (
+ (?:\w+\.|"\w+"\.)?(?:\w+|"\w+")
+ )
+ (?:\s*,\s*\g<1>)*
+ \z
+ /ix
COLUMN_NAME_WITH_ORDER = /
\A
- (?:("?)\w+\k<1>\.)?
- ("?)\w+\k<2>
- (?:\s+ASC|\s+DESC)?
+ (
+ (?:\w+\.|"\w+"\.)?(?:\w+|"\w+")
+ (?:\s+ASC|\s+DESC)?
+ )
+ (?:\s*,\s*\g<1>)*
\z
/ix