bullet_train-roles 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d1f9f6406265c3dac5fe66d3afbcc1938fe73265358f137c88a0a7d766ebbd8
-  data.tar.gz: b912092f5a2fff6f51ddd742af88bd4dfa1155c55c60c2d13369f5b8b7d7b36e
+  metadata.gz: 60ec09c4f08c24e3d3ec9c0a408d6c43395d9088ac37402e89bda662f5c97d7a
+  data.tar.gz: 9cde4b9cf4e9d678cc3d294e23d067bb9cb6602efa7d3d11ec08bde4d21d956e
 SHA512:
-  metadata.gz: 6099e6c850cd5830a5ccb1430e048d0698fbc91606dc96453d640141d07074200dfdddcebe805782211d0eb71194665a57e9727391157d299d584d09e0ab9e8a
-  data.tar.gz: 9598cdcb844fa569cf78eb236bdb7e19c5792e7eeb9e4aec6282dfa1b72027e9adb2ee4092b798e6f3014d13e6a5e5594a9aff9d2f836e4af7a82190f8aa6fe4
+  metadata.gz: f7a33a5bc6b601f07d06f836a2dc529e69eec5dd6a45e9da247ed2ba4c97d4ec25af4e3f59cc91546310b69c8339308ad8cf542cc050e83350cb2f88d30bada9
+  data.tar.gz: c6cc4b869a353bb0855d6b30223a315fd433701b94f7ef7dccc107a40263052daccda5097459c2c730921c5d83ba8a9240b6bf4513824b08716d316c7ba7ef70

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    bullet_train-roles (1.6.2)
+    bullet_train-roles (1.6.4)
       active_hash
       activesupport
       cancancan

data/lib/bullet_train/roles/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Roles
-  VERSION = "1.6.2"
+  VERSION = "1.6.4"
 end

data/lib/generators/bullet_train/roles/install/install_generator.rb

@@ -47,7 +47,7 @@ module BulletTrain
       end
 
       def db_adapter
-        allowed_adapter_types = %w[mysql mysql2 sqlite postgresql]
+        allowed_adapter_types = %w[mysql mysql2 sqlite postgresql trilogy]
 
         adapter_name = ActiveRecord::Base.connection.adapter_name.downcase
 

data/lib/roles/support.rb

@@ -40,7 +40,7 @@ module Roles
       # For example, if you do with_roles(editor) it will return admin users if the admin role includes the editor role
       def self.with_roles(roles)
         # Mysql and postgres have different syntax for searching json or jsonb columns so we need different queries depending on the database
-        ActiveRecord::Base.connection.adapter_name.downcase.include?("mysql") ? with_roles_mysql(roles) : with_roles_postgres(roles)
+        mysql? ? with_roles_mysql(roles) : with_roles_postgres(roles)
       end
 
       def self.with_roles_mysql(roles)
@@ -56,6 +56,10 @@ module Roles
         where("#{table_name}.role_ids ?| array[:keys]", keys: roles.map(&:key_plus_included_by_keys).flatten.uniq.map(&:to_s))
       end
 
+      def self.mysql?
+        ["mysql", "trilogy"].any? { |adapter| ActiveRecord::Base.connection.adapter_name.downcase.include?(adapter) }
+      end
+
       def validate_roles
         self.role_ids = role_ids&.select(&:present?) || []
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-roles
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.4
 platform: ruby
 authors:
 - Prabin Poudel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-10 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug