diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-11-30 13:13:45 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-11-30 13:13:45 +0100 |
| commit | 8299a35d25a68dd9216a0cc6bb719c8aafa2b300 (patch) | |
| tree | d0f1440ac1212f94c90bdb1988277702b83904fb /activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | |
| parent | 0b0f112d2ea2376b5c723c366b3cdc22ddba63d8 (diff) | |
| parent | 8c53b2039e01b1a684a46c000f0ef29adcc1559c (diff) | |
| download | rails-8299a35d25a68dd9216a0cc6bb719c8aafa2b300.tar.gz rails-8299a35d25a68dd9216a0cc6bb719c8aafa2b300.tar.bz2 rails-8299a35d25a68dd9216a0cc6bb719c8aafa2b300.zip | |
Merge pull request #22451 from kamipo/refactor_abstract_adapter_initialize
Refactor `AbstractAdapter#initialize`
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb')
| -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 f731da9e18..aa43854d01 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -192,7 +192,7 @@ module ActiveRecord # Initializes and connects a PostgreSQL adapter. def initialize(connection, logger, connection_parameters, config) - super(connection, logger) + super(connection, logger, config) @visitor = Arel::Visitors::PostgreSQL.new self if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true }) @@ -202,7 +202,7 @@ module ActiveRecord @prepared_statements = false end - @connection_parameters, @config = connection_parameters, config + @connection_parameters = connection_parameters # @local_tz is initialized as nil to avoid warnings when connect tries to use it @local_tz = nil |