aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Marr <harry.marr@gmail.com>2015-10-29 12:03:43 +0000
committerHarry Marr <harry.marr@gmail.com>2015-10-29 12:03:43 +0000
commitd05bfa82ae1bb6dfb6dd4c4a7e089eff456cf4af (patch)
tree87f1eb7b627474d6857e5e11b0e022642418717c
parenta456acb2f2af8365eb9151c7cd2d5a10c189d191 (diff)
downloadrails-d05bfa82ae1bb6dfb6dd4c4a7e089eff456cf4af.tar.gz
rails-d05bfa82ae1bb6dfb6dd4c4a7e089eff456cf4af.tar.bz2
rails-d05bfa82ae1bb6dfb6dd4c4a7e089eff456cf4af.zip
Check standard_conforming_strings is not readonly
In Postgres 8.1 the standard_conforming_strings setting was read-only, meaning you got an error if you tried to update it. By filtering on `context = 'user'` we only try to update the setting if it's user-writable[1]. [1]: http://www.postgresql.org/docs/9.4/static/view-pg-settings.html
-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 2c9b1a0b3d..1b8f8cab94 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -286,7 +286,7 @@ module ActiveRecord
execute(<<-SQL, 'SCHEMA')
UPDATE pg_settings
SET setting = 'on'
- WHERE name = 'standard_conforming_strings'
+ WHERE name = 'standard_conforming_strings' AND context = 'user'
SQL
end