From 146b0948bc2fc659ad291f8c92e255f17ec54f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Pacana?= Date: Fri, 29 Mar 2024 18:08:07 +0100 Subject: [PATCH] Refactor --- ruby_event_store-active_record/spec/migration_test_spec.rb | 7 ++++--- support/helpers/schema_helper.rb | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ruby_event_store-active_record/spec/migration_test_spec.rb b/ruby_event_store-active_record/spec/migration_test_spec.rb index fd3e091ced..ba28ce1810 100644 --- a/ruby_event_store-active_record/spec/migration_test_spec.rb +++ b/ruby_event_store-active_record/spec/migration_test_spec.rb @@ -20,7 +20,8 @@ module ActiveRecord end specify "postgres" do - skip unless ENV["DATABASE_URL"].include?("postgres") + skip unless postgres? + data_type = data_type_to_pg_type(ENV["DATA_TYPE"]) expect( @@ -69,7 +70,7 @@ module ActiveRecord end specify "mysql" do - skip unless ENV["DATABASE_URL"].include?("mysql") + skip unless mysql? data_type = data_type_to_mysql_type(ENV["DATA_TYPE"]) @@ -118,7 +119,7 @@ module ActiveRecord end specify "sqlite" do - skip unless ENV["DATABASE_URL"].include?("sqlite") + skip unless sqlite? expect(sqlite_schema("event_store_events")).to eq <<~SCHEMA.strip CREATE TABLE "event_store_events" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "event_id" varchar(36) NOT NULL, "event_type" varchar NOT NULL, "metadata" blob, "data" blob NOT NULL, "created_at" datetime(6) NOT NULL, "valid_at" datetime(6)) diff --git a/support/helpers/schema_helper.rb b/support/helpers/schema_helper.rb index 588f5be96b..0821e6f4df 100644 --- a/support/helpers/schema_helper.rb +++ b/support/helpers/schema_helper.rb @@ -108,6 +108,10 @@ def template_directory return "mysql" if mysql? end + def sqlite? + ENV["DATABASE_URL"].include?("sqlite") + end + def mysql? ENV["DATABASE_URL"].include?("mysql2") end