diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-18 13:06:58 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-18 13:06:58 -0300 |
| commit | 568394659c3e56581c684df77c0cc0e6e264a99f (patch) | |
| tree | 082e9ae5e2ce90b865bfc14b6abb918c5b94a605 /activerecord/lib/active_record | |
| parent | 8c02918497dca0415de0d7a605b9015b67c623ab (diff) | |
| parent | 052e415f22b98bb45a5245ac8f7aa23c6f32e478 (diff) | |
| download | rails-568394659c3e56581c684df77c0cc0e6e264a99f.tar.gz rails-568394659c3e56581c684df77c0cc0e6e264a99f.tar.bz2 rails-568394659c3e56581c684df77c0cc0e6e264a99f.zip | |
Merge branch 'eliminate_notice_messages'
Closes #6754
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 |
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 b08c59d97d..43e243581c 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -1450,7 +1450,7 @@ module ActiveRecord if @config[:encoding] @connection.set_client_encoding(@config[:encoding]) end - self.client_min_messages = @config[:min_messages] if @config[:min_messages] + 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. |