activerecord-tenant-level-security 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3962a9a504b44336d878715ba3d89f467a07144cd5c5c07d46cd2637deeaf1a5
-  data.tar.gz: 7c388aa4992d1f61e7ae7f3a3d25b4b4227b4009a4f19903516ef21c0357c8b8
+  metadata.gz: 4670da50cc5b9667dcfe37e6d0ec256514e37045ab2108b85a2d518599e03c88
+  data.tar.gz: c1415e5e3580ea401e0d6fa4a26ec7f7ed3be9fb94f1cc5313c204f9a101621f
 SHA512:
-  metadata.gz: ea3c4968b45c2059c7285b71789eef4316aca8bae012b7fe37e1964e2e4d228aee20bc60ac4f75a35cf4b0d8be8ac66e0adf5be9aa53f32dd1e8b619cf9983f0
-  data.tar.gz: c73a26a2c9f79ca1cbba777f11b3df177f9eecd55133ef4a9946d6c99a964c0fb302bbf51b8bd0bb0975db13ddb818e3966198dd4ab1b63ed897e29bd8ea5112
+  metadata.gz: f9274229b916d770bfc716301a5cd374c7f250c9839a44b95881f938e4d697e6e4791dccb80f520e890ad61ab0a74164ce7bda12a879b8a1b4b3aeab6556ca87
+  data.tar.gz: aafa04e789160c58d8f13aca7f8ff977cccced85f08c2fe240dda17c5b3dbb0c37d110ec6ba8d160d306339efd4d938321173007fdfdbd60e1ebb0b9a5887efb

data/.circleci/config.yml

@@ -11,6 +11,8 @@ jobs:
         type: string
     docker:
       - image: << parameters.ruby >>
+        environment:
+          BUNDLE_GEMFILE: gemfiles/<< parameters.rails >>.gemfile
       - image: cimg/<< parameters.postgres >>
         environment:
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -18,8 +20,7 @@ jobs:
       - checkout
       - run: gem install bundler
       - run: bundle install
-      - run: bundle exec appraisal << parameters.rails >> bundle install
-      - run: bundle exec appraisal << parameters.rails >> rspec
+      - run: bundle exec rspec
 
 workflows:
   all-tests:
@@ -27,6 +28,6 @@ workflows:
       - test:
           matrix:
             parameters:
-              ruby: ['ruby:2.7', 'ruby:3.0', 'ruby:3.1']
-              rails: ['rails-6.0', 'rails-6.1', 'rails-7.0']
-              postgres: ['postgres:11.13', 'postgres:12.9', 'postgres:13.5', 'postgres:14.1']
+              ruby: ['ruby:3.1', 'ruby:3.2', 'ruby:3.3']
+              rails: ['rails_6.1', 'rails_7.0', 'rails_7.1']
+              postgres: ['postgres:12.17', 'postgres:13.13', 'postgres:14.10', 'postgres:15.5', 'postgres:16.1']

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## v0.3.0 (2024-08-06)
+
+### Enhancements
+
+### Breaking Changes
+
+- [#18](https://github.com/kufu/activerecord-tenant-level-security/pull/18): CI against Rails 7.1, drop Rails 6.0
+  - Drop support for Rails 6.0
+
+### Enhancements
+
+- [#22](https://github.com/kufu/activerecord-tenant-level-security/pull/22): Enable support for custom column names for tenant-level security policies
+
+### Chores
+
+- [#19](https://github.com/kufu/activerecord-tenant-level-security/pull/19): Modified the sample code in "Sidekiq Integration"
+- [#20](https://github.com/kufu/activerecord-tenant-level-security/pull/20): CI against Ruby 3.3 and PostgreSQL 16, drop Ruby 3.0 and PostgreSQL 11
+- [#21](https://github.com/kufu/activerecord-tenant-level-security/pull/21): Add a guide for using Rails fixtures with RLS in test
+
+## v0.2.0 (2023-04-14)
+
+This release includes changes to policies created by `create_policy`. Migrations that have already been performed will not be affected, so it is safe to upgrade as-is, but for performance reasons it is recommended to update existing policies to the new format. See https://github.com/kufu/activerecord-tenant-level-security/pull/16 for details.
+
+### Breaking Changes
+
+- [#16](https://github.com/kufu/activerecord-tenant-level-security/pull/16): Cast `current_setting` instead of `tenant_id`
+- [#17](https://github.com/kufu/activerecord-tenant-level-security/pull/17): CI against Ruby 3.2 and PostgreSQL 15, drop Ruby 2.7
+
+### Chores
+
+- [#13](https://github.com/kufu/activerecord-tenant-level-security/pull/13): Mention multiple databases support status
+- [#15](https://github.com/kufu/activerecord-tenant-level-security/pull/15): Update License and CoC files
+
 ## v0.1.0 (2023-01-23)
 
 ### BugFixes

data/CODE_OF_CONDUCT.jp.md

@@ -0,0 +1,86 @@
+# コントリビューター行動規範
+
+## 私たちの約束
+メンバー、コントリビューター、およびリーダーとして、年齢、体の大きさ、目に見えるまたは目に見えない障害、民族性、性別、
+性同一性、表現、経験のレベル、教育、社会経済的地位、国籍、人格、人種、宗教、または性的同一性と指向に関係なく、
+コミュニティへの参加をハラスメントのない体験にすることを誓います。
+
+私たちは、オープンで親しみやすく、多様で包括的で健全なコミュニティに貢献する方法で行動し、交流することを誓います。
+
+## 私たちの標準
+
+前向きな環境を作り上げることに貢献する行動の例：
+
+* 他人への共感と優しさを示す
+
+* 異なる意見、視点、経験を尊重する
+
+* 建設的なフィードバックを与え、優雅に受け入れる
+
+* 私たちの過ちの影響を受けた人々に責任を受け入れ、謝罪し、そしてその経験から学ぶ
+
+* 個人としてだけでなく、コミュニティ全体にとっても最善であることに焦点を当てる
+
+許容できない行動の例は次のとおりです。
+
+* 性的な言葉や画像の使用、および性的な注意またはその他あらゆる種類の問題行為
+
+* トローリング、侮辱的または中傷的なコメント、個人的または政治的攻撃
+
+* 公的またはプライベートの嫌がらせ
+
+* 明示的な許可なしに、住所や電子メールアドレスなど、他者の個人情報を公開する
+
+* 職業上不適切と合理的に考えられるその他の行為
+
+## 執行責任
+
+コミュニティリーダーは、許容される行動の基準を明確にし、実施する責任があり、不適切、脅迫的、攻撃的、または有害と見なされる行動に応じて、適切で公正な是正措置を講じます。
+
+コミュニティリーダーは、コメント、コミット、コード、wikiの編集、問題、およびこの行動規範に沿っていないその他の貢献を削除、編集、または拒否する権利と責任を持ち、適切な場合はモデレーションの決定の理由を伝えます。
+
+## 適用範囲
+
+この行動規範は、すべてのコミュニティスペース内で適用され、個人がパブリックスペースでコミュニティを公式に代表している場合にも適用されます。
+私たちのコミュニティを代表する例には、公式の電子メールアドレスの使用、公式のソーシャルメディアアカウントを介した投稿、オンラインまたはオフラインのイベントでの指定代理人としての行動などがあります。
+
+## 執行
+
+虐待的、嫌がらせ、またはその他の許容できない行動の事例は、執行を担当するコミュニティリーダーに対して　`oss@smarthr.co.jp` で報告される場合があります。
+すべての苦情は迅速かつ公正にレビューおよび調査されます。
+
+すべてのコミュニティリーダーは、問題の報告者のプライバシーとセキュリティを尊重する義務があります。
+
+## 執行ガイドライン
+
+コミュニティリーダーは、この行動規範に違反していると見なした行動への帰結を判断する際に、これらのコミュニティガイドラインに従います。
+
+### 1. 更生
+
+**コミュニティへの影響**: コミュニティで専門家にふさわしくない、または歓迎されないと思われる不適切な言葉の使用やその他の不適切な行動をすること。
+
+**帰結**: コミュニティリーダーからの非公開の書面による警告。違反の理由を明確にし、行動が不適切だった理由を説明します。 公の謝罪が要求される場合があります。
+
+### 2. 警告
+
+**コミュニティへの影響**: 単一の出来事または一連の動作による違反。
+
+**帰結**: 持続的な行動の結果を伴う警告。 指定された期間、行動規範の実施者との一方的な対話を含め、関係者との対話はありません。 これには、コミュニティスペースやソーシャルメディアなどの外部チャネルでの相互作用の回避が含まれます。 これらの条件に違反すると、一時的または永続的に禁止される場合があります。
+
+### 3. 一時的な禁止
+**コミュニティへの影響**: 持続的で不適切な行動を含む、コミュニティ標準の重大な違反。
+
+**帰結**: 指定された期間のコミュニティとのあらゆる種類の相互関係または公的なコミュニケーションの一時的な禁止。 この期間中、行動規範を実施する人々との一方的な対話を含め、関係する人々との公的または私的な対話は許可されません。
+これらの条件に違反すると、永久的に禁止される場合があります。
+### 4. 永久的な禁止
+**コミュニティへの影響**: 連続的な不適切な行動、個人への嫌がらせ、または個人の集団に対する攻撃または名誉毀損を含む、コミュニティの標準への違反のパターンを示す。
+
+**帰結**: コミュニティ内でのあらゆる種類の公的な相互関係の永久的な禁止。
+
+## 帰属
+この行動規範は、https://www.contributor-covenant.org/version/2/0/code_of_conduct.html で利用可能な [Contributor Covenant][homepage] バージョン2.0を基に作成されています。
+
+コミュニティへの影響ガイドラインは[Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity)に適合しています。
+
+[homepage]: https://www.contributor-covenant.org
+この行動規範に関する一般的な質問への回答については、https://www.contributor-covenant.org/faq のFAQを参照してください。翻訳はhttps://www.contributor-covenant.org/translations で入手できます。

data/CODE_OF_CONDUCT.md

@@ -1,74 +1,133 @@
+
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at dev@smarthr.co.jp. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+reported to the community leaders responsible for enforcement at
+`oss@smarthr.co.jp`.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+
+Community Impact Guidelines were inspired by 
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
+at [https://www.contributor-covenant.org/translations][translations].
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

data/LICENSE.txt

@@ -1,21 +1,7 @@
-The MIT License (MIT)
+Copyright 2023 SmartHR, Inc.
 
-Copyright (c) 2019 SmartHR, Inc.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,5 @@
 # activerecord-tenant-level-security
+
 [![CircleCI](https://circleci.com/gh/kufu/activerecord-tenant-level-security/tree/master.svg?style=svg)](https://circleci.com/gh/kufu/activerecord-tenant-level-security/tree/master)
 [![gem-version](https://img.shields.io/gem/v/activerecord-tenant-level-security.svg)](https://rubygems.org/gems/activerecord-tenant-level-security)
 [![License](https://img.shields.io/github/license/kufu/activerecord-tenant-level-security.svg?color=blue)](https://github.com/kufu/activerecord-tenant-level-security/blob/master/LICENSE.txt)
@@ -50,12 +51,17 @@ class CreateEmployee < ActiveRecord::Migration[6.0]
       t.string :name
     end
 
+    # By default, "tenant_id" is used as a partition key.
     create_policy :employees
+
+    # You can also use a column other than "tenant_id" by passing the "partition_key" option.
+    # create_policy :employees, partition_key: :company_id
+    # And you can also specify the partition key as a string.
   end
 end
 ```
 
-When testing, be aware of the database user you are connecting to. The default user `postgres` has the `BYPASSRLS` attribute and therefore bypass the RLS. You must create a user who does not have these privileges in order for your application to connect.
+When experimenting, be aware of the database user you are trying to connect with. The default user `postgres` has the `BYPASSRLS` attribute and therefore bypasses the RLS. You must create a user who does not have these privileges in order for your application to connect.
 
 If you want to use this gem, you first need to register a callback which gets the current tenant. This callback is invoked when checking out a new connection from a connection pool. Create an initializer and tell how it should resolve the current tenant like the following:
 
@@ -82,8 +88,8 @@ CREATE POLICY tenant_policy ON employees
   AS PERMISSIVE
   FOR ALL
   TO PUBLIC
-  USING (tenant_id::text = current_setting('tenant_level_security.tenant_id'))
-  WITH CHECK (tenant_id::text = current_setting('tenant_level_security.tenant_id'))
+  USING (tenant_id = NULLIF(current_setting('tenant_level_security.tenant_id'), '')::integer)
+  WITH CHECK (tenant_id = NULLIF(current_setting('tenant_level_security.tenant_id'), '')::integer)
 ```
 
 In the table in which the policy is created, only the rows that match the current setting of `tenant_level_security.tenant_id` can be referenced. This value is set by `TenantLevelSecurity.with` etc.
@@ -119,11 +125,72 @@ Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
     chain.add TenantLevelSecurity::Sidekiq::Middleware::Server
   end
+
+  config.client_middleware do |chain|
+    chain.add TenantLevelSecurity::Sidekiq::Middleware::Client
+  end
 end
 ```
 
 The middleware propagates the current tenant to the job through the session. This allows RLS to be enabled even within workers.
 
+## Multiple Databases
+
+Active Record 6+ adds support for [multiple databases](https://guides.rubyonrails.org/active_record_multiple_databases.html). Note that when using multiple databases with this gem, you need to explicitly switch when connecting other databases.
+
+In multiple databases, Active Record creates a connection pool for each connection, but `TenantLevelSecurity.switch` only switches for the current connection.
+
+## Testing with Rails Fixtures
+
+When testing a Rails app with multiple tenants, you might have fixtures for different tenants that need loading into
+your database. However, Row-Level Security (RLS) might block this because it restricts data access. In order to bypass
+RLS for loading these fixtures, you need to use a special database configuration.
+
+In your database configuration in `config/database.yml`, add a `bypass_rls` cd config. This must use a superuser
+database account, which can load fixtures without RLS restrictions. Do not forget to set `database_tasks: false` to
+prevent Rails from messing with your primary database during setup or teardown tasks.
+
+```yml
+# config/database.yml
+test:
+  primary:
+    <<: *default
+    database: ...
+    username: non_super_user_without_bypass_rls
+  bypass_rls:
+    <<: *default
+    database: ...
+    database_tasks: false # So that the primary db is not re-created or dropped when running rake db:create or db:drop.
+    username: postgres    # This user must have the superuser privileges.
+```
+
+Then in your test setup in `test/test_helper.rb`, make sure to use the `bypass_rls` configuration for loading fixtures.
+This involves connecting to the database with superuser privileges before running tests, especially important for
+parallel tests to ensure each test process works with the correct database instance.
+
+```ruby
+# test/test_helper.rb
+
+# Set up the `test_setup` role so we can utilize the `bypass_rls` config:
+ActiveRecord::Base.connects_to database: { test_setup: :bypass_rls }
+
+class ActiveSupport::TestCase
+  # When running the tests in parallel, Rails automatically updates the primary db config but not the configs with
+  # the `database_tasks: false` option. We need to ensure that the `bypass_rls` config also points to the same db as
+  # the `primary` config.
+  parallelize_setup do |index|
+    ActiveRecord::Base.configurations.configs_for(env_name: "test", include_hidden: true).each do |config|
+      config._database = "#{config.database}-#{index}" unless config.database.end_with?("-#{index}")
+    end
+  end
+
+  # Run setup_fixtures in the test setup to bypass RLS:
+  def setup_fixtures
+    ActiveRecord::Base.connected_to(role: :test_setup) { super }
+  end
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/activerecord-tenant-level-security.gemspec

@@ -24,12 +24,11 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 6.0"
-  spec.add_dependency "activesupport", ">= 6.0"
+  spec.add_dependency "activerecord", ">= 6.1"
+  spec.add_dependency "activesupport", ">= 6.1"
   spec.add_dependency "pg", ">= 1.0"
 
   spec.add_development_dependency "bundler", ">= 2.0"
   spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", ">= 3.0"
-  spec.add_development_dependency "appraisal", "~> 2.4"
 end

data/gemfiles/rails_6.1.gemfile

@@ -1,5 +1,3 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "rails", "~> 6.1.4"

data/gemfiles/rails_7.0.gemfile

@@ -1,5 +1,3 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "rails", "~> 7.0.2"

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1.1"
+
+gemspec path: "../"

data/lib/activerecord-tenant-level-security/schema_dumper.rb

@@ -19,7 +19,8 @@ module TenantLevelSecurity
     def policies_in_database
       query = <<~SQL
         SELECT
-          tablename
+          tablename,
+          qual
         FROM
           pg_policies
         WHERE
@@ -28,23 +29,41 @@ module TenantLevelSecurity
           tablename;
       SQL
       results = ActiveRecord::Base.connection.execute(query)
-      table_names = results.map { |x| x["tablename"] }
+      results.map do |result|
+        table_name = result["tablename"]
+        partition_key = convert_qual_to_partition_key(result["qual"])
+        Policy.new(table_name: table_name, partition_key: partition_key)
+      end
+    end
+
+    private
+
+    def convert_qual_to_partition_key(qual)
+      matched = qual.match(/^\((.+?) = /)
+      # This error can occur if the specification of the 'tenant_policy' in PostgreSQL
+      #   or the 'create_policy' method changes
+      raise "Failed to parse partition key from 'pg_policies.qual': #{qual}" unless matched
 
-      table_names.map { |t| Policy.new(t) }
+      matched[1]
     end
 
     class Policy
-      def initialize(table_name)
+      def initialize(table_name:, partition_key:)
         @table_name = table_name
+        @partition_key = partition_key
       end
 
       def to_schema
-        %(  create_policy "#{table_name}")
+        schema = %(  create_policy "#{table_name}")
+        if partition_key != TenantLevelSecurity::DEFAULT_PARTITION_KEY
+          schema += %(, partition_key: "#{partition_key}")
+        end
+        schema
       end
 
       private
 
-      attr_reader :table_name
+      attr_reader :table_name, :partition_key
     end
   end
 end

data/lib/activerecord-tenant-level-security/schema_statements.rb

@@ -1,28 +1,40 @@
 module TenantLevelSecurity
   module SchemaStatements
-    def create_policy(table_name)
+    def create_policy(table_name, partition_key: TenantLevelSecurity::DEFAULT_PARTITION_KEY)
+      quoted_table_name = quote_table_name(table_name)
+      quoted_partition_key = quote_column_name(partition_key)
       execute <<~SQL
-        ALTER TABLE #{table_name} ENABLE ROW LEVEL SECURITY;
-        ALTER TABLE #{table_name} FORCE ROW LEVEL SECURITY;
+        ALTER TABLE #{quoted_table_name} ENABLE ROW LEVEL SECURITY;
+        ALTER TABLE #{quoted_table_name} FORCE ROW LEVEL SECURITY;
       SQL
+      tenant_id_data_type = get_tenant_id_data_type(table_name, partition_key)
       execute <<~SQL
-        CREATE POLICY tenant_policy ON #{table_name}
+        CREATE POLICY tenant_policy ON #{quoted_table_name}
           AS PERMISSIVE
           FOR ALL
           TO PUBLIC
-          USING (tenant_id::text = current_setting('tenant_level_security.tenant_id'))
-          WITH CHECK (tenant_id::text = current_setting('tenant_level_security.tenant_id'))
+          USING (#{quoted_partition_key} = NULLIF(current_setting('tenant_level_security.tenant_id'), '')::#{tenant_id_data_type})
+          WITH CHECK (#{quoted_partition_key} = NULLIF(current_setting('tenant_level_security.tenant_id'), '')::#{tenant_id_data_type})
       SQL
     end
 
-    def remove_policy(table_name)
+    def remove_policy(table_name, *args)
+      quoted_table_name = quote_table_name(table_name)
       execute <<~SQL
-        ALTER TABLE #{table_name} NO FORCE ROW LEVEL SECURITY;
-        ALTER TABLE #{table_name} DISABLE ROW LEVEL SECURITY;
+        ALTER TABLE #{quoted_table_name} NO FORCE ROW LEVEL SECURITY;
+        ALTER TABLE #{quoted_table_name} DISABLE ROW LEVEL SECURITY;
       SQL
       execute <<~SQL
-        DROP POLICY tenant_policy ON #{table_name}
+        DROP POLICY tenant_policy ON #{quoted_table_name}
       SQL
     end
+
+    private
+    def get_tenant_id_data_type(table_name, partition_key)
+      tenant_id_column = columns(table_name).find { |column| column.name == partition_key.to_s }
+      raise "#{partition_key} column is missing in #{table_name}" if tenant_id_column.nil?
+
+      tenant_id_column.sql_type
+    end
   end
 end

data/lib/activerecord-tenant-level-security/tenant_level_security.rb

@@ -1,4 +1,6 @@
 module TenantLevelSecurity
+  DEFAULT_PARTITION_KEY = 'tenant_id'.freeze
+
   class << self
     # The current_tenant_id sets the default tenant from the outside.
     # Be sure to register in advance as `TenantLevelSecurity.current_tenant_id { id }` with initializers.

data/lib/activerecord-tenant-level-security/version.rb

@@ -1,3 +1,3 @@
 module TenantLevelSecurity
-  VERSION = '0.1.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-tenant-level-security
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - SmartHR
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 description: An Active Record extension for Multitenancy with PostgreSQL Row Level
   Security
 email:
@@ -119,8 +105,8 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- Appraisals
 - CHANGELOG.md
+- CODE_OF_CONDUCT.jp.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -129,9 +115,9 @@ files:
 - activerecord-tenant-level-security.gemspec
 - bin/console
 - bin/setup
-- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
 - lib/activerecord-tenant-level-security.rb
 - lib/activerecord-tenant-level-security/command_recorder.rb
 - lib/activerecord-tenant-level-security/schema_dumper.rb
@@ -145,8 +131,8 @@ licenses:
 metadata:
   homepage_uri: https://github.com/kufu/activerecord-tenant-level-security
   source_code_uri: https://github.com/kufu/activerecord-tenant-level-security
-  changelog_uri: https://github.com/kufu/activerecord-tenant-level-security/blob/v0.1.0/CHANGELOG.md
-post_install_message: 
+  changelog_uri: https://github.com/kufu/activerecord-tenant-level-security/blob/v0.3.0/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -161,8 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: An Active Record extension for Multitenancy with PostgreSQL Row Level Security
 test_files: []

data/Appraisals

@@ -1,11 +0,0 @@
-appraise "rails-6.0" do
-  gem "rails", "~> 6.0.4"
-end
-
-appraise "rails-6.1" do
-  gem "rails", "~> 6.1.4"
-end
-
-appraise "rails-7.0" do
-  gem "rails", "~> 7.0.2"
-end

data/gemfiles/rails_6.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 6.0.4"
-
-gemspec path: "../"