pg_rls 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43fa134f2b679ac9b15406226a50a8b7186a0845c030e931e40f17ba226b5a1c
-  data.tar.gz: 5580815284fecca5bb67435e54e0a9bb775cc56f8524b2bb01a3b85da5c15901
+  metadata.gz: 5296cf19938df79d340f6da931acf0aee13e967720d964ec979773189634c155
+  data.tar.gz: ebf0278848a707e692198346dc734e8da9024c3b5e1325da760c4d7f7cdc30f2
 SHA512:
-  metadata.gz: 976399696e8c22b692d389c99ae7918e66d67c02f485fa4b6ad157f6940fb215bb1440753086c8ba4e26618edc53de04ad8bd4a27198c03739265cc284598001
-  data.tar.gz: 4342defbd2a76a1927e93634b26cd1c1103afc011ff2a24066a257a8e0d8dd28bb73b2adf3925781ea8b5a45785301627495293827e27fb43c606e9036999682
+  metadata.gz: 97465ed5ea998a4c6e6ae39aae82d08ae0663733ef0f442d4716431adb607f13b96fb44139d5c5be83696cbb044cfa778a918a74aa842906ae798869f0fb3145
+  data.tar.gz: c85948bfbcd16f610b2095f2900fee54d3abc3cd27b581eb282144e4b444341a0cfb50c2b1ef98e8cd9d395c22e6218d81fa19d2281df956bb3d8e5cf4e39204

data/.rubocop.yml

@@ -21,3 +21,6 @@ Metrics/BlockLength:
 Security/MarshalLoad:
   Exclude:
   - 'lib/pg_rls/middleware/set_reset_connection.rb'
+Metrics/ModuleLength:
+  Exclude:
+  - 'lib/pg_rls.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_rls (2.0.0)
+    pg_rls (0.1.2)
       bundler (~> 2.2)
 
 GEM

data/lib/pg_rls/middleware/sidekiq/client.rb

@@ -12,11 +12,11 @@ module PgRls
         end
 
         def load_tenant_attribute!(msg)
-          if PgRls.username == PgRls.current_db_username
+          if PgRls.admin_connection?
+            msg['admin'] = true
+          else
             tenant = PgRls::Tenant.fetch!
             msg['pg_rls'] = tenant.id
-          else
-            msg['admin'] = true
           end
         end
       end

data/lib/pg_rls/tenant.rb

@@ -81,7 +81,7 @@ module PgRls
       end
 
       def find_tenant(resource)
-        raise PgRls::Errors::AdminUsername if admin_username?
+        raise PgRls::Errors::AdminUsername if PgRls.admin_connection?
 
         reset_rls!
 
@@ -95,10 +95,6 @@ module PgRls
         raise PgRls::Errors::TenantNotFound if tenant.blank?
       end
 
-      def admin_username?
-        PgRls.username != PgRls.current_db_username
-      end
-
       def find_tenant_by_method(resource, method)
         look_up_value = resource.is_a?(PgRls.main_model) ? resource.send(method) : resource
         PgRls.main_model.send("find_by_#{method}!", look_up_value)

data/lib/pg_rls/version.rb

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

data/lib/pg_rls.rb

@@ -62,20 +62,19 @@ module PgRls
 
     def admin_execute(query = nil, &)
       current_tenant = PgRls::Tenant.fetch
-
-      self.as_db_admin = true
-      establish_new_connection!
+      establish_new_connection!(admin: true)
 
       return ensure_block_execution(&) if block_given?
 
       execute(query)
     ensure
-      self.as_db_admin = false
       establish_new_connection!
       PgRls::Tenant.switch(current_tenant) if current_tenant.present?
     end
 
-    def establish_new_connection!
+    def establish_new_connection!(admin: false)
+      self.as_db_admin = admin
+
       execute_rls_in_shards do |connection_class, pool|
         connection_class.remove_connection
         connection_class.establish_connection(pool.db_config)
@@ -87,17 +86,20 @@ module PgRls
     end
 
     def on_each_tenant(&)
-      result = []
-      main_model.find_each do |tenant|
-        allowed_search_fields = search_methods.map(&:to_s).intersection(main_model.column_names)
-        Tenant.switch tenant.send(allowed_search_fields.first)
+      with_rls_connection do
+        result = []
 
-        result << { tenant:, result: ensure_block_execution(tenant, &) }
-      end
+        main_model.find_each do |tenant|
+          allowed_search_fields = search_methods.map(&:to_s).intersection(main_model.column_names)
+          Tenant.switch tenant.send(allowed_search_fields.first)
 
-      PgRls::Tenant.reset_rls!
+          result << { tenant:, result: ensure_block_execution(tenant, &) }
+        end
 
-      result
+        PgRls::Tenant.reset_rls!
+
+        result
+      end
     end
 
     def execute_rls_in_shards
@@ -123,10 +125,23 @@ module PgRls
       @as_db_admin || false
     end
 
+    def admin_connection?
+      current_db_username != username
+    end
+
     private
 
     attr_writer :as_db_admin
 
+    def with_rls_connection(&)
+      reset_connection = admin_connection?
+
+      establish_new_connection! if reset_connection
+      ensure_block_execution(&)
+    ensure
+      establish_new_connection!(admin: true) if reset_connection
+    end
+
     def ensure_block_execution(*, **)
       yield(*, **).presence
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Laloush