Merge pull request #1187 from seuros/updates

Update CI

Author: enebo

.github/workflows/ruby.yml

@@ -33,7 +33,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8
         ports:
           - 3306
 
@@ -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
@@ -89,10 +92,10 @@ jobs:
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres:17
         env:
           POSTGRES_PASSWORD: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_DB: postgres
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -104,7 +107,8 @@ jobs:
       PREPARED_STATEMENTS: ${{ matrix.prepared_statements }}
       PGHOST: localhost
       PGPORT: 5432
-      PGUSER: postgres
+      PGUSER: arjdbc
+      PGPASSWORD: arjdbc
 
     steps:
       - uses: actions/checkout@v4
@@ -118,10 +122,23 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install PostgreSQL 17 client
+        run: |
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo apt-get update
+          sudo apt-get install -y postgresql-client-17
+      - name: Setup gdiff
+        run: |
+          sudo ln -s /usr/bin/diff /usr/bin/gdiff || true
       - name: Setup database
         run: |
-          psql -c "create database activerecord_unittest;" -U postgres
-          psql -c "create database activerecord_unittest2;" -U postgres
+          PGPASSWORD=postgres psql -h localhost -U postgres -c "CREATE USER arjdbc WITH SUPERUSER CREATEDB LOGIN PASSWORD 'arjdbc';"
+          echo "Testing connection as arjdbc user..."
+          PGPASSWORD=arjdbc psql -h localhost -d postgres -U arjdbc -c '\l'
+          echo "Exit status: $?"
+          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
@@ -158,6 +175,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"
@@ -181,7 +201,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8
         ports:
           - 3306
 
@@ -231,10 +251,10 @@ jobs:
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres:17
         env:
           POSTGRES_PASSWORD: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_DB: postgres
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -247,7 +267,8 @@ jobs:
       INSERT_RETURNING: ${{ matrix.insert_returning }}
       PGHOST: localhost
       PGPORT: 5432
-      PGUSER: postgres
+      PGUSER: arjdbc
+      PGPASSWORD: arjdbc
 
     steps:
       - uses: actions/checkout@v4
@@ -261,6 +282,20 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install PostgreSQL 17 client
+        run: |
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo apt-get update
+          sudo apt-get install -y postgresql-client-17
+      - name: Setup PostgreSQL user
+        run: |
+          PGPASSWORD=postgres psql -h localhost -U postgres -c "CREATE USER arjdbc WITH SUPERUSER CREATEDB LOGIN PASSWORD 'arjdbc';"
+      - name: Test PostgreSQL connection
+        run: |
+          echo "Testing connection as arjdbc user..."
+          PGPASSWORD=arjdbc psql -h localhost -d postgres -U arjdbc -c '\l'
+          echo "Exit status: $?"
       - name: Build
         run: |
           rake jar

.travis.yml

@@ -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 "arjdbc" role' unless PostgresHelper.postgres_role?
 
     load 'test/db/postgres_config.rb' # rescue nil
     puts POSTGRES_CONFIG.inspect if $VERBOSE
@@ -53,11 +53,13 @@ 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'] || 'postgres' }
+    params = { '-U' => ENV['PGUSER'] || 'arjdbc', '-d' => 'postgres' }
+    params['-h'] = ENV['PGHOST'] if ENV['PGHOST']
+    params['-p'] = ENV['PGPORT'] if ENV['PGPORT']
     params['-q'] = nil unless $VERBOSE
 
     puts "Creating PostgreSQL (test) database: #{POSTGRES_CONFIG[:database]}"
-    sh "cat #{script.path} | #{psql} #{params.to_a.join(' ')}", verbose: $VERBOSE
+    sh "PGPASSWORD=#{ENV['PGPASSWORD'] || 'arjdbc'} cat #{script.path} | #{psql} #{params.to_a.join(' ')}", verbose: $VERBOSE
   end
   task postgres: :postgresql
 

rakelib/db.rake

@@ -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/postgres_config.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'] || 'postgres'
+    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] || 'postgres'
+    env['PGPASSWORD'] = db_config[:password] || 'arjdbc'
 
     IO.popen(env, "#{PSQL_EXE} #{args}") { |io| io.read }
   end

test/db/postgresql/rake_test.rb

@@ -25,12 +25,20 @@ module PostgresHelper
   class << self
     def postgres_role?(warn = nil)
       if psql = which('psql')
-        if `#{psql} -c '\\l' -U postgres #{psql_params}2>&1` && $?.exitstatus == 0
+        user = ENV['PGUSER'] || 'arjdbc'
+        password = ENV['PGPASSWORD'] || 'arjdbc'
+        host = ENV['PGHOST'] || 'localhost'
+        port = ENV['PGPORT'] || '5432'
+        
+        # Use simpler command with explicit parameters
+        cmd = "PGPASSWORD=#{password} #{psql} -h #{host} -p #{port} -d postgres -U #{user} -c '\\q' 2>&1"
+        
+        if `#{cmd}` && $?.exitstatus == 0
           true
         else
           if warn.nil?
-            warn =  "No \"postgres\" role ? Make sure service postgresql is running, "
-            warn << "than you might need to execute `createuser postgres -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