Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid disabling postgres errors #22101

Merged
merged 2 commits into from
Oct 29, 2015
Merged

Avoid disabling postgres errors #22101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a456acb
Avoid disabling postgres errors
hmarr Oct 28, 2015
d05bfa8
Check standard_conforming_strings is not readonly
hmarr Oct 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,11 @@ def supports_primary_key? #:nodoc:

# Enable standard-conforming strings if available.
def set_standard_conforming_strings
old, self.client_min_messages = client_min_messages, 'panic'
execute('SET standard_conforming_strings = on', 'SCHEMA') rescue nil
ensure
self.client_min_messages = old
execute(<<-SQL, 'SCHEMA')
UPDATE pg_settings
SET setting = 'on'
WHERE name = 'standard_conforming_strings' AND context = 'user'
SQL
end

def supports_ddl_transactions?
Expand Down