aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-06-10 06:21:23 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-06-10 06:21:23 +0900
commit6607ecb2a1ccc9b43cfb8db2d06dc5301a5320ba (patch)
treec44a96d57dd48f62b994a239cc815903a4a5ff8a /activerecord/lib/active_record/connection_adapters/postgresql
parent1340498d2102423665cc5cfe7be7cdba32c72928 (diff)
downloadrails-6607ecb2a1ccc9b43cfb8db2d06dc5301a5320ba.tar.gz
rails-6607ecb2a1ccc9b43cfb8db2d06dc5301a5320ba.tar.bz2
rails-6607ecb2a1ccc9b43cfb8db2d06dc5301a5320ba.zip
Allow `column_name AS alias` as safe SQL string
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
index 095429dd89..d18c5c5c12 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -90,6 +90,7 @@ module ActiveRecord
\A
(
(?:\w+\.|"\w+"\.)?(?:\w+|"\w+")(?:::\w+)?
+ (?:(?:\s+AS)?\s+(?:\w+|"\w+"))?
)
(?:\s*,\s*\g<1>)*
\z