migrate last reference to postgres

Author: seuros

.github/workflows/ruby.yml

@@ -56,6 +56,9 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Setup gdiff
+        run: |
+          sudo ln -s /usr/bin/diff /usr/bin/gdiff || true
       - name: Setup database
         run: |
           sudo service mysql start
@@ -91,9 +94,8 @@ jobs:
       postgres:
         image: postgres:17
         env:
-          POSTGRES_USER: jruby
-          POSTGRES_PASSWORD: jruby
-          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -120,10 +122,14 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Setup gdiff
+        run: |
+          sudo ln -s /usr/bin/diff /usr/bin/gdiff || true
       - name: Setup database
         run: |
-          PGPASSWORD=jruby psql -c "create database activerecord_unittest;" -U jruby
-          PGPASSWORD=jruby psql -c "create database activerecord_unittest2;" -U jruby
+          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
       - name: Build
         run: |
           rake jar # compiles ext generates: lib/arjdbc/jdbc/adapter_java.jar
@@ -160,6 +166,9 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Setup gdiff
+        run: |
+          sudo ln -s /usr/bin/diff /usr/bin/gdiff || true
       - name: Build
         run: |
           echo "JAVA_OPTS=$JAVA_OPTS"
@@ -235,9 +244,8 @@ jobs:
       postgres:
         image: postgres:17
         env:
-          POSTGRES_USER: jruby
-          POSTGRES_PASSWORD: jruby
-          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -265,6 +273,9 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           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';"
       - 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 "postgres" role' unless PostgresHelper.postgres_role?
+    fail 'could not create test database: missing "jruby" role' unless PostgresHelper.postgres_role?
 
     load 'test/db/postgres_config.rb' # rescue nil
     puts POSTGRES_CONFIG.inspect if $VERBOSE

test/shared_helper.rb

@@ -25,12 +25,15 @@ module PostgresHelper
   class << self
     def postgres_role?(warn = nil)
       if psql = which('psql')
-        if `#{psql} -c '\\l' -U jruby #{psql_params}2>&1` && $?.exitstatus == 0
+        user = ENV['PSQL_USER'] || 'jruby'
+        password = ENV['PGPASSWORD'] || (user == 'jruby' ? 'jruby' : '')
+        cmd = "PGPASSWORD=#{password} #{psql} -d postgres -c '\\l' -U #{user} #{psql_params} 2>&1"
+        if `#{cmd}` && $?.exitstatus == 0
           true
         else
           if warn.nil?
-            warn =  "No \"jruby\" role ? Make sure service postgresql is running, "
-            warn << "than you might need to execute `createuser jruby -drs' first."
+            warn =  "No \"#{user}\" role ? Make sure service postgresql is running, "
+            warn << "than you might need to execute `createuser #{user} -drs' first."
           end
           send(:warn, warn) if warn # warn == false disables warnings
           false