From 6a9323bca4a610cfb8ba3db5cf8ec1dbe762703e Mon Sep 17 00:00:00 2001 From: Harry Marr Date: Thu, 29 Oct 2015 20:03:43 +0000 Subject: Don't disable errors when turning standard_conforming_strings on --- .../lib/active_record/connection_adapters/postgresql_adapter.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 1b8f8cab94..01746d8e14 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -281,13 +281,8 @@ module ActiveRecord true end - # Enable standard-conforming strings if available. def set_standard_conforming_strings - execute(<<-SQL, 'SCHEMA') - UPDATE pg_settings - SET setting = 'on' - WHERE name = 'standard_conforming_strings' AND context = 'user' - SQL + execute('SET standard_conforming_strings = on', 'SCHEMA') end def supports_ddl_transactions? @@ -652,7 +647,7 @@ module ActiveRecord self.client_min_messages = @config[:min_messages] || 'warning' self.schema_search_path = @config[:schema_search_path] || @config[:schema_order] - # Use standard-conforming strings if available so we don't have to do the E'...' dance. + # Use standard-conforming strings so we don't have to do the E'...' dance. set_standard_conforming_strings # If using Active Record's time zone support configure the connection to return -- cgit v1.2.3