pg_rls 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43fa134f2b679ac9b15406226a50a8b7186a0845c030e931e40f17ba226b5a1c
-  data.tar.gz: 5580815284fecca5bb67435e54e0a9bb775cc56f8524b2bb01a3b85da5c15901
+  metadata.gz: 0b51a33bf2c5a0518a96142e8b07e303b32419719dfce1715ee237a0348d19c9
+  data.tar.gz: 3bba1aaa681ab9a6d0defff9110c5f2077b08ff6a07332ad429cd040d8c84a7a
 SHA512:
-  metadata.gz: 976399696e8c22b692d389c99ae7918e66d67c02f485fa4b6ad157f6940fb215bb1440753086c8ba4e26618edc53de04ad8bd4a27198c03739265cc284598001
-  data.tar.gz: 4342defbd2a76a1927e93634b26cd1c1103afc011ff2a24066a257a8e0d8dd28bb73b2adf3925781ea8b5a45785301627495293827e27fb43c606e9036999682
+  metadata.gz: 3ff073704aeca1d9e1b3e8673353deeca756d06b95a32f62fe85ac65cd3f145007c68d6b0b980b78221bdd0f4330421fc540d8efdc7e11600d8adaada1aa105c
+  data.tar.gz: 11711ea29d21eef5d0dccbdfc5916074fe1a98089752f7fc0095ca1d514b40f5c40cb4b0a7a56688160a8afeb67414c3902d88152732774ad62fcbd6c7294140

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.1)
       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.1'
 end

data/lib/pg_rls.rb

@@ -87,6 +87,8 @@ module PgRls
     end
 
     def on_each_tenant(&)
+      set_rls_connection! if admin_connection?
+
       result = []
       main_model.find_each do |tenant|
         allowed_search_fields = search_methods.map(&:to_s).intersection(main_model.column_names)
@@ -100,6 +102,11 @@ module PgRls
       result
     end
 
+    def set_rls_connection!
+      self.as_db_admin = false
+      establish_new_connection!
+    end
+
     def execute_rls_in_shards
       connection_pool_list = PgRls.connection_class.connection_handler.connection_pool_list
       result = []
@@ -123,6 +130,10 @@ module PgRls
       @as_db_admin || false
     end
 
+    def admin_connection?
+      current_db_username != username
+    end
+
     private
 
     attr_writer :as_db_admin

metadata

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