aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib')
-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