From 26f810df83d197d59f9aadbac8d8d3eb96ffa41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Pacana?= Date: Fri, 29 Mar 2024 17:59:05 +0100 Subject: [PATCH] Drop specifying default pool size It's 5 anyway and plain `psql` doesn't know how to handle non-standard DATABASE_URL params. --- .github/workflows/dres_rails_test.yml | 14 +++++++------- .../ruby_event_store-active_record_test.yml | 14 +++++++------- .github/workflows/ruby_event_store-outbox_test.yml | 4 ++-- .github/workflows/ruby_event_store-rom_test.yml | 12 ++++++------ .github/workflows/ruby_event_store-sequel_test.yml | 12 ++++++------ support/ci/generate | 8 ++++---- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/dres_rails_test.yml b/.github/workflows/dres_rails_test.yml index a32bf61a82..4c262d7d69 100644 --- a/.github/workflows/dres_rails_test.yml +++ b/.github/workflows/dres_rails_test.yml @@ -56,31 +56,31 @@ jobs: include: - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: binary - ruby_version: ruby-3.2 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: binary - ruby_version: ruby-3.1 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: binary - ruby_version: ruby-3.0 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: binary - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10011/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10011/rails_event_store data_type: binary - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: json - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: jsonb steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ruby_event_store-active_record_test.yml b/.github/workflows/ruby_event_store-active_record_test.yml index a0bc7a3ad4..319d8440f5 100644 --- a/.github/workflows/ruby_event_store-active_record_test.yml +++ b/.github/workflows/ruby_event_store-active_record_test.yml @@ -96,31 +96,31 @@ jobs: data_type: binary - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: binary - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10011/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10011/rails_event_store data_type: binary - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: json - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: jsonb - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: mysql2://root:secret@127.0.0.1:10008/rails_event_store?pool=5 + database_url: mysql2://root:secret@127.0.0.1:10008/rails_event_store data_type: binary - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: mysql2://root:secret@127.0.0.1:10005/rails_event_store?pool=5 + database_url: mysql2://root:secret@127.0.0.1:10005/rails_event_store data_type: binary - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: mysql2://root:secret@127.0.0.1:10008/rails_event_store?pool=5 + database_url: mysql2://root:secret@127.0.0.1:10008/rails_event_store data_type: json steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ruby_event_store-outbox_test.yml b/.github/workflows/ruby_event_store-outbox_test.yml index 0546bbb0e1..345f288dfb 100644 --- a/.github/workflows/ruby_event_store-outbox_test.yml +++ b/.github/workflows/ruby_event_store-outbox_test.yml @@ -77,10 +77,10 @@ jobs: database_url: sqlite3:db.sqlite3 - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: mysql2://root:secret@127.0.0.1:10005/rails_event_store?pool=5 + database_url: mysql2://root:secret@127.0.0.1:10005/rails_event_store - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: mysql2://root:secret@127.0.0.1:10008/rails_event_store?pool=5 + database_url: mysql2://root:secret@127.0.0.1:10008/rails_event_store steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/ruby_event_store-rom_test.yml b/.github/workflows/ruby_event_store-rom_test.yml index 73ed5fbef8..beefa629d5 100644 --- a/.github/workflows/ruby_event_store-rom_test.yml +++ b/.github/workflows/ruby_event_store-rom_test.yml @@ -86,27 +86,27 @@ jobs: data_type: text - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: text - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10011/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10011/rails_event_store data_type: text - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: json - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: jsonb - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: mysql2://root:secret@127.0.0.1:10008/rails_event_store?pool=5 + database_url: mysql2://root:secret@127.0.0.1:10008/rails_event_store data_type: text - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: mysql2://root:secret@127.0.0.1:10005/rails_event_store?pool=5 + database_url: mysql2://root:secret@127.0.0.1:10005/rails_event_store data_type: text steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ruby_event_store-sequel_test.yml b/.github/workflows/ruby_event_store-sequel_test.yml index 33ae6b7024..f5fb915da3 100644 --- a/.github/workflows/ruby_event_store-sequel_test.yml +++ b/.github/workflows/ruby_event_store-sequel_test.yml @@ -86,27 +86,27 @@ jobs: data_type: text - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: text - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10011/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10011/rails_event_store data_type: text - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: json - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: postgres://postgres:secret@localhost:10015/rails_event_store?pool=5 + database_url: postgres://postgres:secret@localhost:10015/rails_event_store data_type: jsonb - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: mysql2://root:secret@127.0.0.1:10008/rails_event_store?pool=5 + database_url: mysql2://root:secret@127.0.0.1:10008/rails_event_store data_type: text - ruby_version: ruby-3.3 bundle_gemfile: Gemfile - database_url: mysql2://root:secret@127.0.0.1:10005/rails_event_store?pool=5 + database_url: mysql2://root:secret@127.0.0.1:10005/rails_event_store data_type: text steps: - uses: actions/checkout@v4 diff --git a/support/ci/generate b/support/ci/generate index 2c47c00200..7de7ecfc37 100755 --- a/support/ci/generate +++ b/support/ci/generate @@ -35,13 +35,13 @@ class CI SQLITE3 = "sqlite3:db.sqlite3", POSTGRES = [ POSTGRES_15 = - "postgres://postgres:secret@localhost:10015/rails_event_store?pool=5", + "postgres://postgres:secret@localhost:10015/rails_event_store", POSTGRES_11 = - "postgres://postgres:secret@localhost:10011/rails_event_store?pool=5" + "postgres://postgres:secret@localhost:10011/rails_event_store" ], MYSQL = [ - MYSQL_8 = "mysql2://root:secret@127.0.0.1:10008/rails_event_store?pool=5", - MYSQL_5 = "mysql2://root:secret@127.0.0.1:10005/rails_event_store?pool=5" + MYSQL_8 = "mysql2://root:secret@127.0.0.1:10008/rails_event_store", + MYSQL_5 = "mysql2://root:secret@127.0.0.1:10005/rails_event_store" ] ].flatten