From 4f4f248fa1898d5f72e0bf5e35d9be578396eb94 Mon Sep 17 00:00:00 2001 From: rubic0n Date: Sun, 10 Jan 2021 23:05:57 -0600 Subject: [PATCH] postgresql_makara adapter is Postgres, not MySQL --- lib/gabsocial/migration_helpers.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/gabsocial/migration_helpers.rb b/lib/gabsocial/migration_helpers.rb index 5451ffca..67da012d 100644 --- a/lib/gabsocial/migration_helpers.rb +++ b/lib/gabsocial/migration_helpers.rb @@ -43,7 +43,9 @@ module GabSocial module MigrationHelpers # Stub for Database.postgresql? from GitLab def self.postgresql? - ActiveRecord::Base.configurations[Rails.env]['adapter'].casecmp('postgresql').zero? + %w[postgresql postgresql_makara].any? do |adapter| + ActiveRecord::Base.configurations[Rails.env]['adapter'].casecmp(adapter).zero? + end end # Stub for Database.mysql? from GitLab