pg_rls 0.0.1.4.2 → 0.0.1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c49344c7e0967e1afe2cf3f982678fcdae6edec8766fa92ed51f644594be84e
-  data.tar.gz: 21812122d43412184edefcc4cbe45ba7a160ff5d335f01de8f4962b20fb6e5e6
+  metadata.gz: 05d5356859c19958958aaf0c3160e2bafc66a5b3464b542b4087e8684b70dd7c
+  data.tar.gz: 2e53e808f31b07293ea6b1071f8e237be72d483964df2d4313c1215973a07fcd
 SHA512:
-  metadata.gz: f423f4793439745830715c5a6058c3703445185dee9e0219ceb68c09a57dcd728ddc758daa35947fef94c0248b7cf075ba73452c9eb2e4ee79e8d8d344ab78d9
-  data.tar.gz: 2ad9bb3bac5e097f708075d44b08755621f2cf8202f6a9894dc7171e5ffd728f072d10f61d9df8aabc72297a453ae065088ddf4e403a16f8bb0fc2e2c1d29f7e
+  metadata.gz: b4535bef8f1ed1595cd2639a2db3168c3c0d67b5f94db461bead0d1c00e94fec492e4dbf6a8481baa3f76e102946ec95ab6eed5f2930ecd010feb5d90c1f9da5
+  data.tar.gz: 2c14bc491065d684f962a122923fbbba7e40766a02fc870c91d15655ba7a204a1aaec7656e45ae6f11cc2245a56b8327e861dba721a92fc06bb7a62660216952

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     pg_rls (0.0.1.4.2)
-      bundler (>= 2.2.10)
+      bundler (~> 2.2)
 
 GEM
   remote: https://rubygems.org/

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/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/version.rb

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

data/lib/pg_rls.rb

@@ -94,10 +94,14 @@ module PgRls
       ActiveRecord::Migration.execute(query)
     end
 
+    def database_default_configuration
+      connection_class.connection.pool.db_config.configuration_hash
+    end
+
     def database_configuration
-      database_connection_file[Rails.env].tap do |config|
-        config['username'] = PgRls::SECURE_USERNAME unless default_connection?
-      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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rls
 version: !ruby/object:Gem::Version
-  version: 0.0.1.4.2
+  version: 0.0.1.4.3
 platform: ruby
 authors:
 - Daniel Laloush
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="