aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorDylan Markow <dylan@dylanmarkow.com>2013-06-07 17:36:37 -0500
committerDylan Markow <dylan@dylanmarkow.com>2013-06-19 11:03:40 -0500
commit78f6268977d80f3e6dcb916dd185ef046caf8586 (patch)
tree5c5e7f4c676bfbfd71b64d2a593401259507a8c2 /activerecord/lib/active_record
parent2b763131eacaae5bff9ffb5015fbf367d594dc64 (diff)
downloadrails-78f6268977d80f3e6dcb916dd185ef046caf8586.tar.gz
rails-78f6268977d80f3e6dcb916dd185ef046caf8586.tar.bz2
rails-78f6268977d80f3e6dcb916dd185ef046caf8586.zip
Handle single quotes in PostgreSQL default column values
PostgreSQL escapes single quotes by using an additional single quote. When Rails queries the column information, PostgreSQL returns the default values with the escaped single quotes. #extract_value_from_default now converts these to one single quote each. Fixes #10881.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index d5a603cadc..98126249df 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -84,7 +84,7 @@ module ActiveRecord
$1
# Character types
when /\A\(?'(.*)'::.*\b(?:character varying|bpchar|text)\z/m
- $1
+ $1.gsub(/''/, "'")
# Binary data types
when /\A'(.*)'::bytea\z/m
$1