pg_rls 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 492256f8c775835d6ed888cc64e93bff4c0a3f9583eb9c459e1ed9a5520d7fab
-  data.tar.gz: f05611afd74ad000316df9622663de94d8feda84538de06cf5c548e749a60302
+  metadata.gz: 0e815f8e1e99ddf19dcd53be6876034dbeb535985c46ab7111555ac0fa02c02a
+  data.tar.gz: 4ce207b4766242cdc97940b313bb9a8ea864250ebd953bf4c36168d6ceced848
 SHA512:
-  metadata.gz: cabd8e2479dbf5432a26b34680932a6ff2a4b1d2f6cbd6c1c369d8f4b954a69baa4cfefe8a81f86995b07f2a966a8129d664adf9115de23c0dbb3a91623cc52a
-  data.tar.gz: 4f66a3686927071d5aa5f66374a63450cda26c9be6ebc86d1cf085fc373f90033e2e7d2fe50f4b1945452088122df3884ca5cd97746c43905615858cccf5fed6
+  metadata.gz: 9369bf467e43421b42093783428b3fdb544806ee378ad67e43500fecd530e971bc50b3671faf7cb54d126281bf21c5f88a7f9bb3eeffa52bdce0068578cfae04
+  data.tar.gz: d6fef41724951488a13c21fad439cc3f1f0c781e918d022f426adce50d81e8133f98961695042143dd8c6f96a229d8e6d42baed8cadf563b14b5ece4f8960611

data/Gemfile

@@ -17,4 +17,5 @@ gem 'rubocop-performance'
 gem 'rubocop-rails'
 gem 'rubocop-rake'
 gem 'rubocop-rspec'
+gem 'sidekiq'
 gem 'solargraph'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_rls (0.1.6)
+    pg_rls (0.1.10)
 
 GEM
   remote: https://rubygems.org/
@@ -109,6 +109,7 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
+    logger (1.6.0)
     loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -184,6 +185,8 @@ GEM
     rbs (2.8.4)
     rdoc (6.5.0)
       psych (>= 4.0.0)
+    redis-client (0.22.2)
+      connection_pool
     regexp_parser (2.8.2)
     reline (0.3.9)
       io-console (~> 0.5)
@@ -236,6 +239,12 @@ GEM
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    sidekiq (7.3.1)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      logger
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
     solargraph (0.49.0)
       backport (~> 1.2)
       benchmark
@@ -268,6 +277,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -280,6 +290,7 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rake
   rubocop-rspec
+  sidekiq
   solargraph
 
 RUBY VERSION

data/lib/pg_rls/current/context.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module PgRls
+  # Current Context
+  module Current
+    class Context < ActiveSupport::CurrentAttributes
+      attribute :tenant
+    end
+  end
+end

data/lib/pg_rls/tenant.rb

@@ -36,7 +36,7 @@ module PgRls
       end
 
       def fetch!
-        PgRls.main_model.find_by!(
+        PgRls::Current::Context.tenant ||= PgRls.main_model.find_by!(
           tenant_id: PgRls.connection_class.connection.execute(
             "SELECT current_setting('rls.tenant_id')"
           ).getvalue(0, 0)
@@ -50,6 +50,7 @@ module PgRls
           end
         end
 
+        PgRls::Current::Context.clear_all
         nil
       end
 

data/lib/pg_rls/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRls
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

data/lib/pg_rls.rb

@@ -11,6 +11,7 @@ require_relative 'pg_rls/tenant'
 require_relative 'pg_rls/multi_tenancy'
 require_relative 'pg_rls/railtie' if defined?(Rails)
 require_relative 'pg_rls/errors/index'
+require_relative 'pg_rls/current/context'
 
 ActiveRecord::Migrator.prepend PgRls::Admin::ActiveRecord::Migrator
 ActiveRecord::Tasks::DatabaseTasks.prepend PgRls::Admin::ActiveRecord::Tasks::DatabaseTasks
@@ -54,7 +55,6 @@ module PgRls
     def establish_new_connection!(admin: false)
       self.as_db_admin = admin
 
-      db_config = PgRls.main_model.connection_db_config.configuration_hash
       execute_rls_in_shards do |connection_class, pool|
         connection_class.connection_pool.disconnect!
         connection_class.remove_connection
@@ -141,11 +141,9 @@ module PgRls
     end
 
     def execute_query_or_block(query = nil, &)
-      if block_given?
-        ensure_block_execution(&)
-      else
-        execute(query)
-      end
+      return ensure_block_execution(&) if block_given?
+
+      execute(query)
     end
 
     def reset_connection_if_needed(current_tenant, reset_rls_connection)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Daniel Laloush
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies: []
 description: |2
       This gem will help you to integrate PostgreSQL RLS to help you develop a great multitenancy application
@@ -47,6 +47,7 @@ files:
 - lib/generators/templates/pg_rls.rb.tt
 - lib/pg_rls.rb
 - lib/pg_rls/Rakefile
+- lib/pg_rls/current/context.rb
 - lib/pg_rls/database/admin_statements.rb
 - lib/pg_rls/database/configurations.rb
 - lib/pg_rls/database/prepared.rb