Cleanup whitespace and remove keys instead of providing nil

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8907 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 2 insertions, 4 deletions

diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 3c5ba6c285..94277704d1 100755
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -71,8 +71,8 @@ namespace :postgresql do
   task :build_databases do
     %x( createdb activerecord_unittest )
     %x( createdb activerecord_unittest2 )
-    %x( psql activerecord_unittest -f #{File.join(SCHEMA_ROOT, 'postgresql.sql')}  )
-    %x( psql activerecord_unittest2 -f #{File.join(SCHEMA_ROOT, 'postgresql2.sql')}   )
+    %x( psql activerecord_unittest -f #{File.join(SCHEMA_ROOT, 'postgresql.sql')} )
+    %x( psql activerecord_unittest2 -f #{File.join(SCHEMA_ROOT, 'postgresql2.sql')} )
   end
 
   desc 'Drop the PostgreSQL test databases'
diff --git a/activerecord/test/connections/native_postgresql/connection.rb b/activerecord/test/connections/native_postgresql/connection.rb
index 7ee83f4837..3b5ff90003 100644
--- a/activerecord/test/connections/native_postgresql/connection.rb
+++ b/activerecord/test/connections/native_postgresql/connection.rb
@@ -7,13 +7,11 @@ ActiveRecord::Base.logger = Logger.new("debug.log")
 ActiveRecord::Base.configurations = {
   'arunit' => {
     :adapter  => 'postgresql',
-    :username => nil,
     :database => 'activerecord_unittest',
     :min_messages => 'warning'
   },
   'arunit2' => {
     :adapter  => 'postgresql',
-    :username => nil,
     :database => 'activerecord_unittest2',
     :min_messages => 'warning'
   }