aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-02-20 00:40:34 +0000
committerMichael Koziarski <michael@koziarski.com>2008-02-20 00:40:34 +0000
commit921752c7d594850e3d4a6d5c72459310fdf5d0f6 (patch)
treebc4888f81bd55dc326fd9bac8412cb31eedff841
parentab45bd487a935ae9558e814ca06b1e4e71ba554a (diff)
downloadrails-921752c7d594850e3d4a6d5c72459310fdf5d0f6.tar.gz
rails-921752c7d594850e3d4a6d5c72459310fdf5d0f6.tar.bz2
rails-921752c7d594850e3d4a6d5c72459310fdf5d0f6.zip
Remove reference to 'postgres' user in the connection and Rakefiles. Allows postgres permissions to fallback to host / ident based auth.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8906 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rwxr-xr-xactiverecord/Rakefile12
-rw-r--r--activerecord/test/connections/native_postgresql/connection.rb4
2 files changed, 8 insertions, 8 deletions
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 3feee4d6d7..3c5ba6c285 100755
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -69,16 +69,16 @@ task :rebuild_mysql_databases => 'mysql:rebuild_databases'
namespace :postgresql do
desc 'Build the PostgreSQL test databases'
task :build_databases do
- %x( createdb -U postgres activerecord_unittest )
- %x( createdb -U postgres activerecord_unittest2 )
- %x( psql activerecord_unittest -f #{File.join(SCHEMA_ROOT, 'postgresql.sql')} postgres )
- %x( psql activerecord_unittest2 -f #{File.join(SCHEMA_ROOT, 'postgresql2.sql')} postgres )
+ %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')} )
end
desc 'Drop the PostgreSQL test databases'
task :drop_databases do
- %x( dropdb -U postgres activerecord_unittest )
- %x( dropdb -U postgres activerecord_unittest2 )
+ %x( dropdb activerecord_unittest )
+ %x( dropdb activerecord_unittest2 )
end
desc 'Rebuild the PostgreSQL test databases'
diff --git a/activerecord/test/connections/native_postgresql/connection.rb b/activerecord/test/connections/native_postgresql/connection.rb
index d644441fcc..7ee83f4837 100644
--- a/activerecord/test/connections/native_postgresql/connection.rb
+++ b/activerecord/test/connections/native_postgresql/connection.rb
@@ -7,13 +7,13 @@ ActiveRecord::Base.logger = Logger.new("debug.log")
ActiveRecord::Base.configurations = {
'arunit' => {
:adapter => 'postgresql',
- :username => 'postgres',
+ :username => nil,
:database => 'activerecord_unittest',
:min_messages => 'warning'
},
'arunit2' => {
:adapter => 'postgresql',
- :username => 'postgres',
+ :username => nil,
:database => 'activerecord_unittest2',
:min_messages => 'warning'
}