This test suite need a full rewrite, it showing it age .

Author: seuros

.github/workflows/ruby.yml

@@ -107,8 +107,8 @@ jobs:
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
       PGHOST: localhost
       PGPORT: 5432
-      PGUSER: jruby
-      PGPASSWORD: jruby
+      PGUSER: arjdbc
+      PGPASSWORD: arjdbc
 
     steps:
       - uses: actions/checkout@v4
@@ -127,9 +127,9 @@ jobs:
           sudo ln -s /usr/bin/diff /usr/bin/gdiff || true
       - name: Setup database
         run: |
-          PGPASSWORD=postgres psql -h localhost -U postgres -c "CREATE USER jruby WITH SUPERUSER CREATEDB LOGIN PASSWORD 'jruby';"
-          PGPASSWORD=jruby psql -h localhost -d postgres -c "create database activerecord_unittest;" -U jruby
-          PGPASSWORD=jruby psql -h localhost -d postgres -c "create database activerecord_unittest2;" -U jruby
+          PGPASSWORD=postgres psql -h localhost -U postgres -c "CREATE USER arjdbc WITH SUPERUSER CREATEDB LOGIN PASSWORD 'arjdbc';"
+          PGPASSWORD=arjdbc psql -h localhost -d postgres -c "create database activerecord_unittest;" -U arjdbc
+          PGPASSWORD=arjdbc psql -h localhost -d postgres -c "create database activerecord_unittest2;" -U arjdbc
       - name: Build
         run: |
           rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.jar
@@ -258,8 +258,8 @@ jobs:
       INSERT_RETURNING: ${{ matrix.insert_returning }}
       PGHOST: localhost
       PGPORT: 5432
-      PGUSER: jruby
-      PGPASSWORD: jruby
+      PGUSER: arjdbc
+      PGPASSWORD: arjdbc
 
     steps:
       - uses: actions/checkout@v4
@@ -275,7 +275,7 @@ jobs:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Setup PostgreSQL user
         run: |
-          PGPASSWORD=postgres psql -h localhost -U postgres -c "CREATE USER jruby WITH SUPERUSER CREATEDB LOGIN PASSWORD 'jruby';"
+          PGPASSWORD=postgres psql -h localhost -U postgres -c "CREATE USER arjdbc WITH SUPERUSER CREATEDB LOGIN PASSWORD 'arjdbc';"
       - name: Build
         run: |
           rake jar

rakelib/db.rake

@@ -39,7 +39,7 @@ GRANT ALL PRIVILEGES ON `test\_%`.* TO #{MYSQL_CONFIG[:username]}@localhost;
   task :postgresql do
     require File.expand_path('../../test/shared_helper', __FILE__)
     fail 'could not create test database: psql executable not found' unless psql = which('psql')
-    fail 'could not create test database: missing "jruby" role' unless PostgresHelper.postgres_role?
+    fail 'could not create test database: missing "arjdbc" role' unless PostgresHelper.postgres_role?
 
     load 'test/db/postgres_config.rb' # rescue nil
     puts POSTGRES_CONFIG.inspect if $VERBOSE
@@ -53,7 +53,7 @@ CREATE DATABASE #{POSTGRES_CONFIG[:database]} OWNER #{POSTGRES_CONFIG[:username]
        ENCODING '#{POSTGRES_CONFIG[:encoding]}' LC_COLLATE '#{POSTGRES_CONFIG[:collate]}' LC_CTYPE '#{POSTGRES_CONFIG[:collate]}';
     SQL
 
-    params = { '-U' => ENV['PSQL_USER'] || 'jruby' }
+    params = { '-U' => ENV['PGUSER'] || 'arjdbc' }
     params['-q'] = nil unless $VERBOSE
 
     puts "Creating PostgreSQL (test) database: #{POSTGRES_CONFIG[:database]}"

test/db/postgres_config.rb

@@ -1,9 +1,9 @@
 POSTGRES_CONFIG = {
   :adapter => 'postgresql',
-  :database => 'arjdbc_test',
+  :database => ENV['PGDATABASE'] || 'arjdbc_test',
   :host => 'localhost',
-  :username => 'arjdbc',
-  :password => 'arjdbc',
+  :username => ENV['PGUSER'] || 'arjdbc',
+  :password => ENV['PGPASSWORD'] || 'arjdbc',
   :connect_timeout => 10, # seconds
   :encoding => 'utf8',
   :collate => 'en_US.UTF-8',

test/db/postgresql/rake_test.rb

@@ -115,14 +115,14 @@ def psql(args)
     end
 
     # Use the test database user or fallback to ENV
-    username = db_config[:username] || ENV['PSQL_USERNAME'] || 'jruby'
+    username = db_config[:username] || ENV['PGUSER'] || 'arjdbc'
     args = "--username=#{username} #{args}"
 
     puts "psql args: #{args}"
 
     # Set PGPASSWORD for authentication
     env = {}
-    env['PGPASSWORD'] = db_config[:password] || 'jruby'
+    env['PGPASSWORD'] = db_config[:password] || 'arjdbc'
 
     IO.popen(env, "#{PSQL_EXE} #{args}") { |io| io.read }
   end

test/shared_helper.rb

@@ -25,8 +25,8 @@ module PostgresHelper
   class << self
     def postgres_role?(warn = nil)
       if psql = which('psql')
-        user = ENV['PSQL_USER'] || 'jruby'
-        password = ENV['PGPASSWORD'] || (user == 'jruby' ? 'jruby' : '')
+        user = ENV['PGUSER'] || 'arjdbc'
+        password = ENV['PGPASSWORD'] || 'arjdbc'
         cmd = "PGPASSWORD=#{password} #{psql} -d postgres -c '\\l' -U #{user} #{psql_params} 2>&1"
         if `#{cmd}` && $?.exitstatus == 0
           true