rls_multi_tenant 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50eff8f3ced091cac7b277aff79cfd435a0ce0701ee2ca3ca7163d57e6792406
-  data.tar.gz: 7739392cf8b866e5d6e86ccebeeccb3a3e913b7efbccf89a4441d79dfbc93f84
+  metadata.gz: a289abc220420817eb9b817ea2b40cdc44021491fe362f05d2d0dd982ffb21ab
+  data.tar.gz: 65c2f9f291a39026ac829f7252298eb527cd0d25c79a4ead1bc461a978d4d3df
 SHA512:
-  metadata.gz: a8c6c0d9323251de3b6bc8321cb8bae781ae8248ea37dd9cf643aa7e4e0441234c42084d7391dcd73d4735e20080c27025969359e5dfe1c9f0bea0d30e5aa34d
-  data.tar.gz: 7788deda9e7deb6c49e7fd9359cfb06e648044c48d78ac9e1823b3cf91eb0deff90db6d95e94f2433adc726b0d6fd924b822958cab0c7882da0667d7af606def
+  metadata.gz: 896ae1cd8155bc3c2c47064776a1780459e0f2a29c5f307e186514b0a3a2be21ff682a940e6c09e989b6a9033f230fdf872865b02f8152d34af07888f041175c
+  data.tar.gz: d40bd80268219f951db636be6f8e05eefa9ab82c172ed4085eb2e18597e94cf3cc902d76bf70fb803c497e2a8c629e4c13982c9fcd67e2311a61e90fd1b5b226

data/lib/rls_multi_tenant/concerns/tenant_context.rb

@@ -8,6 +8,7 @@ module RlsMultiTenant
       SET_TENANT_ID_SQL = 'SET %s = %s'
       RESET_TENANT_ID_SQL = 'RESET %s'
 
+      # rubocop:disable Metrics/BlockLength
       class_methods do
         def tenant_session_var
           "rls.#{RlsMultiTenant.tenant_id_column}"
@@ -15,12 +16,15 @@ module RlsMultiTenant
 
         # Switch tenant context for a block
         def switch(tenant_or_id)
-          tenant_id = extract_tenant_id(tenant_or_id)
-          validate_tenant_exists!(tenant_id)
-          connection.execute format(SET_TENANT_ID_SQL, tenant_session_var, connection.quote(tenant_id))
+          previous_tenant_id = current_tenant_id
+          switch!(tenant_or_id)
           yield
         ensure
-          reset!
+          begin
+            switch!(previous_tenant_id)
+          rescue StandardError => _e
+            reset!
+          end
         end
 
         # Switch tenant context permanently (until reset)
@@ -39,8 +43,8 @@ module RlsMultiTenant
         def current
           return nil unless connection.active?
 
-          result = connection.execute("SHOW #{tenant_session_var}")
-          tenant_id = result.first&.dig(tenant_session_var)
+          result = connection.execute("SELECT current_setting('#{tenant_session_var}', true) AS tenant_id")
+          tenant_id = result.first&.dig('tenant_id')
 
           return nil if tenant_id.blank?
 
@@ -51,6 +55,15 @@ module RlsMultiTenant
 
         private
 
+        def current_tenant_id
+          return nil unless connection.active?
+
+          result = connection.execute("SELECT current_setting('#{tenant_session_var}', true) AS tenant_id")
+          result.first&.dig('tenant_id')
+        rescue ActiveRecord::StatementInvalid, PG::Error
+          nil
+        end
+
         def extract_tenant_id(tenant_or_id)
           case tenant_or_id
           when ->(obj) { obj.is_a?(RlsMultiTenant.tenant_class) }
@@ -71,6 +84,7 @@ module RlsMultiTenant
           raise StandardError, "#{RlsMultiTenant.tenant_class_name} with id '#{tenant_id}' not found"
         end
       end
+      # rubocop:enable Metrics/BlockLength
 
       # Instance methods
       def switch(tenant_or_id, &block)

data/lib/rls_multi_tenant/middleware/subdomain_tenant_selector.rb

@@ -104,7 +104,7 @@ module RlsMultiTenant
 
       def excluded_subdomain?(subdomain)
         return false if subdomain.blank?
-        
+
         excluded = RlsMultiTenant.excluded_subdomains
         excluded.is_a?(Array) && excluded.include?(subdomain.to_s.downcase)
       end

data/lib/rls_multi_tenant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RlsMultiTenant
-  VERSION = '0.2.7'
+  VERSION = '0.2.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rls_multi_tenant
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Coding Ways