pg_rls 0.0.1.4 → 0.0.1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00bc08507823f0659023716267357992118618dd2d69536cf1936f7ffa903961
-  data.tar.gz: 499004adf0eb1db60bba0e1899a08cc943c64f0e90495016b0acf1a322520731
+  metadata.gz: 05d5356859c19958958aaf0c3160e2bafc66a5b3464b542b4087e8684b70dd7c
+  data.tar.gz: 2e53e808f31b07293ea6b1071f8e237be72d483964df2d4313c1215973a07fcd
 SHA512:
-  metadata.gz: e9ed07f6dfb3477c100eebc4afc2fd72fd639637fc200dd4ce6130e2cbdcb9fb3c6b9c4e5b3955397eb3bd08811542e0c96b954497110d148f048ef8f2583bed
-  data.tar.gz: 04d74bc577004804a4a5cb039f48dfb32b1bdc8b018aee47729202e6c58bfb7711698b789dfdb575ae715e50c4f78f5a36516841176169481b64bbeafd071dc1
+  metadata.gz: b4535bef8f1ed1595cd2639a2db3168c3c0d67b5f94db461bead0d1c00e94fec492e4dbf6a8481baa3f76e102946ec95ab6eed5f2930ecd010feb5d90c1f9da5
+  data.tar.gz: 2c14bc491065d684f962a122923fbbba7e40766a02fc870c91d15655ba7a204a1aaec7656e45ae6f11cc2245a56b8327e861dba721a92fc06bb7a62660216952

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pg_rls.gemspec
 gemspec
-ruby '3.0.2'
+ruby '3.1.1'
 
 gem 'rails', '~> 6.1.4', '>= 6.1.4.1'
 

data/Gemfile.lock

@@ -1,66 +1,66 @@
 PATH
   remote: .
   specs:
-    pg_rls (0.0.1)
-      bundler (>= 2.2.10)
+    pg_rls (0.0.1.4.2)
+      bundler (~> 2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actioncable (6.1.5)
+      actionpack (= 6.1.5)
+      activesupport (= 6.1.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailbox (6.1.5)
+      actionpack (= 6.1.5)
+      activejob (= 6.1.5)
+      activerecord (= 6.1.5)
+      activestorage (= 6.1.5)
+      activesupport (= 6.1.5)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailer (6.1.5)
+      actionpack (= 6.1.5)
+      actionview (= 6.1.5)
+      activejob (= 6.1.5)
+      activesupport (= 6.1.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionpack (6.1.5)
+      actionview (= 6.1.5)
+      activesupport (= 6.1.5)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actiontext (6.1.5)
+      actionpack (= 6.1.5)
+      activerecord (= 6.1.5)
+      activestorage (= 6.1.5)
+      activesupport (= 6.1.5)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (6.1.5)
+      activesupport (= 6.1.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activejob (6.1.5)
+      activesupport (= 6.1.5)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activestorage (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      marcel (~> 1.0.0)
+    activemodel (6.1.5)
+      activesupport (= 6.1.5)
+    activerecord (6.1.5)
+      activemodel (= 6.1.5)
+      activesupport (= 6.1.5)
+    activestorage (6.1.5)
+      actionpack (= 6.1.5)
+      activejob (= 6.1.5)
+      activerecord (= 6.1.5)
+      activesupport (= 6.1.5)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.1)
+    activesupport (6.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -68,15 +68,15 @@ GEM
       zeitwerk (~> 2.3)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     erubi (1.10.0)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.12.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -84,87 +84,87 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.14.4)
+    minitest (5.15.0)
     nio4r (2.5.8)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.3-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4.1)
-      actioncable (= 6.1.4.1)
-      actionmailbox (= 6.1.4.1)
-      actionmailer (= 6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actiontext (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    rails (6.1.5)
+      actioncable (= 6.1.5)
+      actionmailbox (= 6.1.5)
+      actionmailer (= 6.1.5)
+      actionpack (= 6.1.5)
+      actiontext (= 6.1.5)
+      actionview (= 6.1.5)
+      activejob (= 6.1.5)
+      activemodel (= 6.1.5)
+      activerecord (= 6.1.5)
+      activestorage (= 6.1.5)
+      activesupport (= 6.1.5)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.1)
+      railties (= 6.1.5)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (6.1.5)
+      actionpack (= 6.1.5)
+      activesupport (= 6.1.5)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.1)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.22.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    sprockets (4.0.2)
+    sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   x86_64-linux
@@ -177,7 +177,7 @@ DEPENDENCIES
   rubocop
 
 RUBY VERSION
-   ruby 3.0.2p107
+   ruby 3.1.1p18
 
 BUNDLED WITH
-   2.2.27
+   2.3.7

data/README.md

@@ -1,3 +1,10 @@
+<!--
+  Title: PgRls Rails
+  Description: rails multitenancy with pg rls
+  Author: dandush03
+  -->
+<meta name="google-site-verification" content="Mc1vBv8PRYPw_cdd3EiKhF2vlOeIEIk3VYhAg75ertI" />
+
 [![Contributors][contributors-shield]][contributors-url]
 [![Forks][forks-shield]][forks-url]
 [![Stargazers][stars-shield]][stars-url]
@@ -77,7 +84,28 @@ You can swtich to another tenant by using
 ```ruby
 PgRls::Tenant.switch :app #=> where app eq tenant name
 ```
-Don't forget to update how you want `PgRls` to find your tenant, you can set multiple options by modifying `api/config/initializers/pg_rls.rb` `search_methods`  
+Don't forget to update how you want `PgRls` to find your tenant, you can set multiple options by modifying `api/config/initializers/pg_rls.rb` `search_methods`
+
+You can add the following configuration to your Database Config File to improve performance and remove `PgRls::SecureConnection` from `aplication_record.rb`
+
+```yml
+# app/config/database.yml
+<% def db_username
+    return PgRls::SECURE_USERNAME unless ENV['AS_DB_ADMIN']
+
+    Rails.application.credentials.dig(:database, :server_1, :username)
+   end %>
+
+...
+
+development:
+  <<: *default
+  database: example_development
+  username: <%= db_username %> # Apply this to production and all env including tests
+
+...
+
+```
 ### Testing
 
 Many application uses some sort of database cleaner before running thair spec so on each test that we run we'll have an empty state. Usually, those gems clear our user configuration for the database. To solve this issue, we must implement the following:

data/lib/generators/pg_rls/active_record/active_record_generator.rb

@@ -20,25 +20,19 @@ module PgRls
       end
 
       def create_tenant_migration_file
-        return if migration_exist?
-
-        migration_template create_migration_template_path,
+        migration_template(create_migration_template_path,
                            "#{migration_path}/#{create_file_sub_name}_#{table_name}.rb",
-                           migration_version: migration_version
+                           migration_version: migration_version) if creating?
       end
 
       def convert_tenant_migration_file
-        return unless migration_exist?
-
-        migration_template convert_migration_template_path,
+        migration_template(convert_migration_template_path,
                            "#{migration_path}/#{convert_file_sub_name}_#{table_name}.rb",
-                           migration_version: migration_version
+                           migration_version: migration_version) unless creating?
 
-        return if installation_in_progress?
-
-        migration_template 'convert_migration_backport.rb.tt',
+        migration_template('convert_migration_backport.rb.tt',
                            "#{migration_path}/pg_rls_backport_#{table_name}.rb",
-                           migration_version: migration_version
+                           migration_version: migration_version) if installation_in_progress?
       end
 
       def create_model_file
@@ -103,6 +97,10 @@ module PgRls
         db_migrate_path
       end
 
+      def creating?
+        @creating ||= !migration_exist?
+      end
+
       protected
 
       def migration_action() = 'add'

data/lib/generators/pg_rls/active_record/templates/convert_migration_backport.rb.tt

@@ -2,8 +2,6 @@
 
 class PgRlsBackport<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
   def up
-    PgRls.establish_default_connection
-
     # Suggested Code:
     # PgRls.all_tenants do |tenant|
     #   tenant.<%= table_name %>.in_batches(of: 100) do |<%= table_name %>|

data/lib/pg_rls/Rakefile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require_relative '../pg_rls'
+
+path = File.expand_path(__dir__)
+Dir.glob("#{path}/database/tasks/**/*.rake").each { |f| import f }

data/lib/pg_rls/database/prepared.rb

@@ -5,16 +5,31 @@ module PgRls
     # Prepare database for test unit
     module Prepared
       class << self
-        def grant_user_credentials(name: PgRls::SECURE_USERNAME)
-          return unless Rails.env.test?
+        def grant_user_credentials(name: PgRls::SECURE_USERNAME, password: 'password')
+          return unless Rails.env.test? || PgRls.default_connection?
 
-          PgRls.execute <<-SQL
-            GRANT USAGE, SELECT
-              ON ALL SEQUENCES IN SCHEMA public
-                TO #{name};
+          PgRls.admin_execute <<-SQL
+            DO
+            $do$
+            BEGIN
+              IF NOT EXISTS (
+                SELECT FROM pg_catalog.pg_roles AS r
+                WHERE r.rolname = '#{name}') THEN
+
+                  CREATE USER #{name} WITH PASSWORD '#{password}';
+              END IF;
+            END
+            $do$;
+            GRANT USAGE ON SCHEMA public TO #{name};
+            ALTER DEFAULT PRIVILEGES IN SCHEMA public
+              GRANT SELECT, INSERT, UPDATE, DELETE
+              ON TABLES TO #{name};
             GRANT SELECT, INSERT, UPDATE, DELETE
               ON ALL TABLES IN SCHEMA public
-                TO #{name};
+              TO #{name};
+            GRANT USAGE, SELECT
+              ON ALL SEQUENCES IN SCHEMA public
+              TO #{name};
           SQL
         end
       end

data/lib/pg_rls/database/tasks/admin_database.rake

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+# OVERIDE RAILS TASK
+Rake::TaskManager.class_eval do
+  def alias_task(fq_name)
+    new_name = "#{fq_name}:original"
+    @tasks[new_name] = @tasks.delete(fq_name)
+  end
+end
+
+def alias_task(fq_name)
+  Rake.application.alias_task(fq_name)
+end
+
+def override_task(*args, &block)
+  name, _params, _deps = Rake.application.resolve_args(args.dup)
+  fq_name = Rake.application.instance_variable_get(:@scope).to_a.reverse.push(name).join(':')
+  alias_task(fq_name)
+  Rake::Task.define_task(*args, &block)
+end
+
+namespace :db do
+  override_task create: :load_config do
+    system('AS_DB_ADMIN=true rake db:create:original')
+  end
+
+  override_task drop: :load_config do
+    system('AS_DB_ADMIN=true rake db:drop:original')
+  end
+
+  override_task migrate: :load_config do
+    system('AS_DB_ADMIN=true rake db:migrate:original')
+  end
+
+  override_task rollback: :load_config do
+    system('AS_DB_ADMIN=true rake db:rollback:original')
+  end
+
+  override_task prepare: :load_config do
+    system('AS_DB_ADMIN=true rake db:prepare:original')
+  end
+
+  override_task setup: :load_config do
+    system('AS_DB_ADMIN=true rake db:setup:original')
+  end
+
+  override_task prepare: :load_config do
+    system('AS_DB_ADMIN=true rake db:reset:original')
+  end
+
+  override_task purge: :load_config do
+    system('AS_DB_ADMIN=true rake db:purge:original')
+  end
+
+  override_task abort_if_pending_migrations: :load_config do
+    system('AS_DB_ADMIN=true rake db:abort_if_pending_migrations:original')
+  end
+
+  override_task seed: :load_config do
+    system('AS_DB_ADMIN=true rake db:seed:original')
+  end
+
+  namespace :test do
+    override_task create: :load_config do
+      system('AS_DB_ADMIN=true rake db:test:create:original')
+    end
+
+    override_task drop: :load_config do
+      system('AS_DB_ADMIN=true rake db:test:drop:original')
+    end
+
+    override_task prepare: :load_config do
+      system('AS_DB_ADMIN=true rake db:test:prepare:original')
+    end
+
+    override_task setup: :load_config do
+      system('AS_DB_ADMIN=true rake db:test:setup:original')
+    end
+
+    override_task purge: :load_config do
+      system('AS_DB_ADMIN=true rake db:test:purge:original')
+    end
+
+    override_task load_schema: :load_config do
+      system('AS_DB_ADMIN=true rake db:test:load_schema:original')
+    end
+  end
+
+  namespace :enviroment do
+    override_task set: :load_config do
+      system('AS_DB_ADMIN=true rake db:enviroment:set:original')
+    end
+  end
+
+  namespace :schema do
+    override_task load: :load_config do
+      system('AS_DB_ADMIN=true rake db:schema:load:original')
+      PgRls.admin_execute do
+        PgRls.execute <<-SQL
+          DROP ROLE IF EXISTS #{PgRls::SECURE_USERNAME};
+          CREATE USER #{PgRls::SECURE_USERNAME} WITH PASSWORD '#{PgRls.database_configuration['password']}';
+          GRANT ALL PRIVILEGES ON TABLE schema_migrations TO #{PgRls::SECURE_USERNAME};
+          GRANT USAGE ON SCHEMA public TO #{PgRls::SECURE_USERNAME};
+          ALTER DEFAULT PRIVILEGES IN SCHEMA public
+            GRANT SELECT, INSERT, UPDATE, DELETE
+            ON TABLES TO #{PgRls::SECURE_USERNAME};
+          GRANT SELECT, INSERT, UPDATE, DELETE
+            ON ALL TABLES IN SCHEMA public
+            TO #{PgRls::SECURE_USERNAME};
+          GRANT USAGE, SELECT
+            ON ALL SEQUENCES IN SCHEMA public
+            TO #{PgRls::SECURE_USERNAME};
+        SQL
+      end
+    end
+  end
+end

data/lib/pg_rls/errors/tenant_not_found.rb

@@ -0,0 +1,18 @@
+module PgRls
+  module Errors
+    class TenantNotFound < StandardError
+      def initialize
+        reset_tenant_id
+        super
+      end
+
+      def message
+        "Tenant Doesn't exist"
+      end
+
+      def reset_tenant_id
+        PgRls.connection_class.connection.execute('RESET rls.tenant_id')
+      end
+    end
+  end
+end

data/lib/pg_rls/railtie.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative '../pg_rls'
+require 'rails'
+
+module PgRls
+  # Extend Rails Railties
+  class Railtie < Rails::Railtie
+    railtie_name :my_gem
+
+    rake_tasks do
+      path = File.dirname(__FILE__)
+      Dir.glob("#{path}/database/tasks/**/*.rake").each { |f| load f }
+    end
+  end
+end

data/lib/pg_rls/schema/statements.rb

@@ -11,7 +11,7 @@ module PgRls
       include DownStatements
 
       def create_rls_tenant_table(table_name, **options, &block)
-        create_rls_user(password: PgRls.database_configuration['password'])
+        create_rls_user(password: PgRls.database_default_configuration[:password])
         create_rls_setter_function
         create_rls_blocking_function
         create_table(table_name, **options, &block)
@@ -41,7 +41,7 @@ module PgRls
       end
 
       def convert_to_rls_tenant_table(table_name, **_options)
-        create_rls_user(password: PgRls.database_configuration['password'])
+        create_rls_user(password: PgRls.database_default_configuration[:password])
         create_rls_setter_function
         create_rls_blocking_function
         add_rls_column_to_tenant_table(table_name)

data/lib/pg_rls/schema/up_statements.rb

@@ -6,19 +6,28 @@ module PgRls
     module UpStatements
       def create_rls_user(name: PgRls::SECURE_USERNAME, password: 'password')
         PgRls.execute <<-SQL
-          DROP ROLE IF EXISTS #{name};
-          CREATE USER #{name} WITH PASSWORD '#{password}';
-          GRANT ALL PRIVILEGES ON TABLE schema_migrations TO #{name};
-          GRANT USAGE ON SCHEMA public TO #{name};
-          ALTER DEFAULT PRIVILEGES IN SCHEMA public
-            GRANT SELECT, INSERT, UPDATE, DELETE
-            ON TABLES TO #{name};
-          GRANT SELECT, INSERT, UPDATE, DELETE
-            ON ALL TABLES IN SCHEMA public
-            TO #{name};
-          GRANT USAGE, SELECT
-            ON ALL SEQUENCES IN SCHEMA public
-            TO #{name};
+          DO
+          $do$
+          BEGIN
+            IF NOT EXISTS (
+                SELECT FROM pg_catalog.pg_roles  -- SELECT list can be empty for this
+                WHERE  rolname = '#{name}') THEN
+
+                CREATE USER #{name} WITH PASSWORD '#{password}';
+                GRANT ALL PRIVILEGES ON TABLE schema_migrations TO #{name};
+                GRANT USAGE ON SCHEMA public TO #{name};
+                ALTER DEFAULT PRIVILEGES IN SCHEMA public
+                  GRANT SELECT, INSERT, UPDATE, DELETE
+                  ON TABLES TO #{name};
+                GRANT SELECT, INSERT, UPDATE, DELETE
+                  ON ALL TABLES IN SCHEMA public
+                  TO #{name};
+                GRANT USAGE, SELECT
+                  ON ALL SEQUENCES IN SCHEMA public
+                  TO #{name};
+            END IF;
+          END
+          $do$;
         SQL
       end
 

data/lib/pg_rls/tenant.rb

@@ -5,11 +5,12 @@ module PgRls
   module Tenant
     class << self
       def switch(resource)
+        @fetch = nil
         connection_adapter = PgRls.connection_class
         find_tenant(resource)
         connection_adapter.connection.execute(format('SET rls.tenant_id = %s',
                                                      connection_adapter.connection.quote(tenant.tenant_id)))
-        "RLS changed to '#{tenant.name}'"
+        "RLS changed to '#{tenant.send(@method)}'"
       rescue StandardError => e
         puts 'connection was not made'
         puts @error || e
@@ -18,7 +19,7 @@ module PgRls
       attr_reader :tenant
 
       def fetch
-        @fetch ||= tenant.find_by_tenant_id(
+        @fetch ||= PgRls.main_model.find_by_tenant_id(
           PgRls.connection_class.connection.execute(
             "SELECT current_setting('rls.tenant_id')"
           ).getvalue(0, 0)
@@ -31,9 +32,12 @@ module PgRls
         @tenant = nil
 
         PgRls.search_methods.each do |method|
-          @tenant ||= PgRls.main_model.send("find_by_#{method}", resource)
+          @method = method
+          @tenant ||= PgRls.main_model.send("find_by_#{method}!", resource)
         rescue NoMethodError => e
           @error = e
+        rescue ActiveRecord::RecordNotFound
+          raise PgRls::Errors::TenantNotFound
         end
       end
     end

data/lib/pg_rls/version.rb

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

data/lib/pg_rls.rb

@@ -8,6 +8,8 @@ require_relative 'pg_rls/schema/statements'
 require_relative 'pg_rls/tenant'
 require_relative 'pg_rls/secure_connection'
 require_relative 'pg_rls/multi_tenancy'
+require_relative 'pg_rls/railtie' if defined?(Rails)
+require_relative 'pg_rls/errors/tenant_not_found'
 
 # PostgreSQL Row Level Security
 module PgRls
@@ -17,9 +19,9 @@ module PgRls
   class << self
     extend Forwardable
 
-    WRITER_METHODS = %i[table_name class_name search_methods].freeze
+    WRITER_METHODS = %i[table_name class_name search_methods establish_default_connection].freeze
     READER_METHODS = %i[
-      connection_class database_configuration execute table_name class_name search_methods
+      connection_class database_configuration execute table_name class_name search_methods establish_default_connection
     ].freeze
     DELEGATORS_METHODS = %i[
       connection_class database_configuration execute table_name search_methods
@@ -51,8 +53,20 @@ module PgRls
       )
     end
 
-    def establish_default_connection
-      @default_connection = true
+    def admin_execute(query = nil)
+      self.establish_default_connection = true
+      establish_new_connection
+      return yield if block_given?
+
+      execute(query)
+    ensure
+      self.establish_default_connection = false
+      establish_new_connection
+    end
+
+    def establish_default_connection=(value)
+      ENV['AS_DB_ADMIN'] = value.to_s
+      @default_connection = value
     end
 
     def default_connection?
@@ -77,13 +91,17 @@ module PgRls
     end
 
     def execute(query)
-      @execute = ActiveRecord::Migration.execute(query)
+      ActiveRecord::Migration.execute(query)
+    end
+
+    def database_default_configuration
+      connection_class.connection.pool.db_config.configuration_hash
     end
 
     def database_configuration
-      @database_configuration ||= database_connection_file[Rails.env].tap do |config|
-        config['username'] = PgRls::SECURE_USERNAME
-      end
+      current_configuration = database_default_configuration.deep_dup
+      current_configuration.tap { |config| config[:username] = PgRls::SECURE_USERNAME unless default_connection? }
+      current_configuration.freeze
     end
   end
   mattr_accessor :table_name

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.0.1.4
+  version: 0.0.1.4.3
 platform: ruby
 authors:
 - Daniel Laloush
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: '2.2'
 description: |2
       This gem will help you to integrate PostgreSQL RLS to help you develop a great multitenancy application
       checkout the repository at https://github.com/Dandush03/pg_rls
@@ -60,8 +60,12 @@ files:
 - lib/generators/templates/README
 - lib/generators/templates/pg_rls.rb.tt
 - lib/pg_rls.rb
+- lib/pg_rls/Rakefile
 - lib/pg_rls/database/prepared.rb
+- lib/pg_rls/database/tasks/admin_database.rake
+- lib/pg_rls/errors/tenant_not_found.rb
 - lib/pg_rls/multi_tenancy.rb
+- lib/pg_rls/railtie.rb
 - lib/pg_rls/schema/down_statements.rb
 - lib/pg_rls/schema/statements.rb
 - lib/pg_rls/schema/up_statements.rb
@@ -79,16 +83,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.