Merge pull request #3298 from manyfold3d/fix-postgres-detection

Check database adapter name rather than class in regex checks
manyfold3d · Dec 10, 2024 · 9e294b6 · 9e294b6
2 parents 89dbab3 + 013e5bd
commit 9e294b6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/concerns/filterable.rb b/app/controllers/concerns/filterable.rb
@@ -98,7 +98,7 @@ def filter_by_missing_tag(models, missingtag, library)
       tag_regex_build = []
       regexes = ((missingtag != "") ? [missingtag] : Library.find_param(library).tag_regex)
       # Regexp match syntax - postgres is different from MySQL and SQLite
-      regact = ApplicationRecord.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) ? "~" : "REGEXP"
+      regact = (ApplicationRecord.connection.adapter_name == "PostgreSQL") ? "~" : "REGEXP"
       regexes.each do |reg|
         qreg = ActiveRecord::Base.connection.quote(reg)
         tag_regex_build.push "(select count(*) from tags join taggings on tags.id=taggings.tag_id where tags.name #{regact} #{qreg} and taggings.taggable_id=models.id and taggings.taggable_type='Model')<1"

diff --git a/app/views/application/_tag_list.html.erb b/app/views/application/_tag_list.html.erb
@@ -3,7 +3,7 @@
   <% if @models
        tierunset = tiers.map { |tier|
          reg = ActiveRecord::Base.connection.quote("^" + tier + ":")
-         regact = ApplicationRecord.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) ? "~" : "REGEXP"
+         regact = (ApplicationRecord.connection.adapter_name == "PostgreSQL") ? "~" : "REGEXP"
          [tier, @models.where("(select count(*) from tags join taggings on tags.id=taggings.tag_id where tags.name #{regact} #{reg} and taggings.taggable_id=models.id and taggings.taggable_type='Model')<1").count]
        }.to_h
      end %>

diff --git a/app/views/layouts/settings.html.erb b/app/views/layouts/settings.html.erb
@@ -44,7 +44,7 @@
         <li class="nav-item">
           <%= link_to t(".sidekiq"), sidekiq_web_path, class: "nav-link" %>
         </li>
-        <% if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && ApplicationRecord.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) %>
+        <% if ApplicationRecord.connection.adapter_name == "PostgreSQL" %>
           <li class="nav-item">
             <%= link_to t(".pghero"), pg_hero_path, class: "nav-link" %>
           </li>