chore(rails): add postgresql to test/CI

Author: solnic

.devcontainer/docker-compose.yml

@@ -16,8 +16,12 @@ services:
     <<: *sentry-build
     entrypoint: ".devcontainer/run --service dev"
     command: "sleep infinity"
+    links:
+      - redis
+      - postgres
     depends_on:
       - redis
+      - postgres
 
   sentry-test:
     <<: *sentry-build
@@ -27,6 +31,15 @@ services:
       - "${SENTRY_E2E_RAILS_APP_PORT}:4000"
       - "${SENTRY_E2E_SVELTE_APP_PORT}:4001"
 
+  postgres:
+    image: postgres:15
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=sentry
+    ports:
+      - "5432:5432"
+
   redis:
     image: redis:latest
     environment:

.github/workflows/sentry_rails_test.yml

@@ -20,6 +20,17 @@ jobs:
     name: Ruby ${{ matrix.ruby_version }} & Rails ${{ matrix.rails_version }}, options - ${{ toJson(matrix.options) }}
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    services:
+      postgres:
+        image: postgres:15
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: sentry
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     env:
       RUBYOPT: ${{ matrix.options.rubyopt }}
       BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-rails/Gemfile
@@ -31,6 +42,9 @@ jobs:
       matrix:
         ruby_version: ${{ fromJson(inputs.versions) }}
         rails_version: [6.1.0, 7.0.0, 7.1.0]
+        db:
+          - "sqlite3://./db/db.sqlite3"
+          - "postgresql://postgres:postgres@localhost:5432/sentry"
         include:
           - ruby_version: "2.7"
             rails_version: 5.2.0
@@ -84,6 +98,8 @@ jobs:
 
       - name: Build with Rails ${{ matrix.rails_version }}
         run: bundle exec rake
+        env:
+          DATABASE_URL: ${{ matrix.db }}
 
       - name: Upload Coverage
         uses: codecov/codecov-action@v5

sentry-rails/Gemfile

@@ -29,6 +29,7 @@ end
 rails_version = Gem::Version.new(rails_version)
 
 gem "rails", "~> #{rails_version}"
+gem "pg", platform: :ruby
 
 if rails_version >= Gem::Version.new("8.1.0")
   gem "rspec-rails", "~> 8.0.0"

sentry-rails/spec/dummy/test_rails_app/config/application.rb

@@ -49,6 +49,14 @@ def self.db_path
           @db_path ||= root_path.join("db", "db.sqlite3")
         end
 
+        def self.db_uri
+          @db_url ||= URI(ENV["DATABASE_URL"] || "sqlite3://#{db_path}")
+        end
+
+        def self.db_name
+          db_uri.path[1..-1]
+        end
+
         def self.application_file
           @application_file ||= begin
             current = Dir[root_path.join("config/applications/rails-*.rb")]
@@ -61,14 +69,24 @@ def self.application_file
 
         def self.load_test_schema
           @__schema_loaded__ ||= begin
-            # This is more reliable than setting config/database.yml
-            ENV["DATABASE_URL"] = "sqlite3://#{db_path}"
-
             # Silence migrations output
             ActiveRecord::Migration.verbose = false
 
             # We need to connect manually here
-            ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: db_path)
+            case db_uri.scheme
+            when "postgresql"
+              ActiveRecord::Base.establish_connection(
+                adapter: db_uri.scheme,
+                host: db_uri.host,
+                username: db_uri.user,
+                password: db_uri.password,
+                database: db_uri.path[1..-1]
+              )
+            else
+              ActiveRecord::Base.establish_connection(
+                adapter: db_uri.scheme, database: db_uri.path[1..-1]
+              )
+            end
 
             # Load schema from db/schema.rb into the current connection
             require Test::Application.schema_file

sentry-rails/spec/sentry/rails/log_subscribers/active_record_subscriber_spec.rb

@@ -242,8 +242,8 @@
           expect(log_event).not_to be_nil
 
           attributes = log_event[:attributes]
-          expect(attributes[:db_system][:value]).to eq("sqlite3")
-          expect(attributes[:db_name][:value]).to eq("db.sqlite3")
+          expect(attributes[:db_system][:value]).to eq(Rails.application.db_uri.scheme)
+          expect(attributes[:db_name][:value]).to eq(Rails.application.db_name)
         end
       end
     end