diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-02 14:04:46 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-02 14:04:46 -0700 |
| commit | 6a5ab08d21c4284a05f5e34484b18a91d4e5c50c (patch) | |
| tree | 9e137c96162a108727bbfaec9f489dfe52bf5465 /activerecord | |
| parent | a6a84152b4e7655ef1993788da32ee662ef7a040 (diff) | |
| parent | 950ef055852fce3c7dca7fa1c5cc3eb3f9c93265 (diff) | |
| download | rails-6a5ab08d21c4284a05f5e34484b18a91d4e5c50c.tar.gz rails-6a5ab08d21c4284a05f5e34484b18a91d4e5c50c.tar.bz2 rails-6a5ab08d21c4284a05f5e34484b18a91d4e5c50c.zip | |
Merge pull request #10430 from larskanis/add_sslcompression_to_pg_adapter
Add parameter :sslcompression to PostgreSQL adapter.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 654aac8453..df729259e9 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -20,8 +20,8 @@ module ActiveRecord VALID_CONN_PARAMS = [:host, :hostaddr, :port, :dbname, :user, :password, :connect_timeout, :client_encoding, :options, :application_name, :fallback_application_name, :keepalives, :keepalives_idle, :keepalives_interval, :keepalives_count, - :tty, :sslmode, :requiressl, :sslcert, :sslkey, :sslrootcert, :sslcrl, - :requirepeer, :krbsrvname, :gsslib, :service] + :tty, :sslmode, :requiressl, :sslcompression, :sslcert, :sslkey, + :sslrootcert, :sslcrl, :requirepeer, :krbsrvname, :gsslib, :service] # Establishes a connection to the database that's used by all Active Record objects def postgresql_connection(config) |