activerecord-multi-tenant 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac7c3d60913d1596d061cdca9fca210c2f5e44eb87c60fe55a65f05161840fa
-  data.tar.gz: b183e17a1effb9ad711e784a4ae82be5eb209b8b6d84993cfe4ea5db5c2fe800
+  metadata.gz: fb96e241668d1b08b01d087f2223f7ae703a73e09412f67aadb297aa0bb43818
+  data.tar.gz: f8e964e5549e489c93baaf0ce61b150eac3f3bb7c327dbec7994288c096a535c
 SHA512:
-  metadata.gz: 3892fefdeb8636a7ceb80d5538cf49c73f7baf9957226f59156b8cfdceacd92760392aba0eee8232f17a9604eed1b502b9257c0df0614882e2d948afb64398ce
-  data.tar.gz: b79eb29f19b1b5c2f3320fc3b79bc6fc8baa64a5217059a093e6fce77884280a9f9f67be2d1f842e620addfa61711704a63052c8b75c2ad3de68cd3c4e7a8407
+  metadata.gz: 5746bb54fb98adf017c0c888b6993a2e82fcca9a0f56588e405230bc1750c63723f89b9664b8f2d31dc11cbd43a1ee43a9d4e39f1ba784f4f9fc09450245833c
+  data.tar.gz: 448dda3c1b4406afe5aa602aa965bc5be35b18cbd539f8cd28fdd626ea00b65970d993fe6ae637ffeca3c809c43ab556ae2fdfdadcac853923b3222e798c6dc1

data/.github/workflows/CI.yml

@@ -19,12 +19,10 @@ jobs:
           - '3.0'
           - '3.1'
         gemfile:
-          - rails_5.2.3
           - rails_5.2
           - rails_6.0
           - rails_6.1
           - rails_7.0
-          - active_record_5.2.3
           - active_record_5.2
           - active_record_6.0
           - active_record_6.1
@@ -49,14 +47,6 @@ jobs:
             gemfile: 'rails_5.2'
           - ruby: '3.1'
             gemfile: 'active_record_5.2'
-          - ruby: '3.0'
-            gemfile: 'rails_5.2.3'
-          - ruby: '3.0'
-            gemfile: 'active_record_5.2.3'
-          - ruby: '3.1'
-            gemfile: 'rails_5.2.3'
-          - ruby: '3.1'
-            gemfile: 'active_record_5.2.3'
     name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }} ${{ (matrix.prepared_statements && 'w/ prepared statements') || '' }}
     env:
        BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.1.5      2022-11-20
+* Fix `MultiTenant.without` codegen bug in Rails 6.1+ [#168](https://github.com/citusdata/activerecord-multi-tenant/pull/168)
+
 ## 2.1.4      2022-11-03
 * Fixes #166 where db:schema:dump is broken when using this gem with MySQL [#167](https://github.com/citusdata/activerecord-multi-tenant/pull/167)
 

data/lib/activerecord-multi-tenant/query_rewriter.rb

@@ -330,8 +330,9 @@ module ActiveRecord
         return nil, nil
       end
 
-      if children[0].right.respond_to?('relation') && children[0].left.respond_to?('relation')
-        return children[0].right.relation, children[0].left.relation
+      child = children.first.respond_to?(:children) ? children.first.children.first : children.first
+      if child.right.respond_to?(:relation) && child.left.respond_to?(:relation)
+        return child.right.relation, child.left.relation
       end
 
       return nil, nil

data/lib/activerecord-multi-tenant/version.rb

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '2.1.4'
+  VERSION = '2.1.5'
 end

data/spec/activerecord-multi-tenant/model_extensions_spec.rb

@@ -299,6 +299,55 @@ describe MultiTenant do
     end
   end
 
+  # Joins
+  describe 'joins for models' do
+    context 'for models with where condition in associations' do
+      let(:account) { Account.create!(name: 'Account 1') }
+
+      it 'should add tenant condition to the queries when tenant is set' do
+        expected_join_sql = <<-SQL.strip
+          SELECT "comments".* FROM "comments" INNER JOIN "tasks" ON "tasks"."id" = "comments"."commentable_id" AND "comments"."commentable_type" = 'Task' AND "tasks"."account_id" = 1 WHERE "comments"."account_id" = 1
+        SQL
+
+        MultiTenant.with(account) do
+          expect(Comment.joins(:task).to_sql).to eq(expected_join_sql)
+        end
+      end
+
+      it 'should add tenant condition to the queries when tenant is not set' do
+        MultiTenant.without do
+          expected_join_sql = <<-SQL.strip
+            SELECT "comments".* FROM "comments" INNER JOIN "tasks" ON "tasks"."id" = "comments"."commentable_id" AND "comments"."commentable_type" = 'Task' AND "comments"."account_id" = "tasks"."account_id"
+          SQL
+          expect(Comment.joins(:task).to_sql).to eq(expected_join_sql)
+        end
+      end
+    end
+
+    context 'for models with default associations' do
+      let(:account) { Account.create!(name: 'Account 1') }
+
+      it 'should add tenant condition to the queries when tenant is set' do
+        expected_join_sql = <<-SQL.strip
+          SELECT "projects".* FROM "projects" INNER JOIN "tasks" ON "tasks"."project_id" = "projects"."id" AND "tasks"."account_id" = 1 WHERE "projects"."account_id" = 1
+        SQL
+
+        MultiTenant.with(account) do
+          expect(Project.joins(:tasks).to_sql).to eq(expected_join_sql)
+        end
+      end
+
+      it 'should add tenant condition to the queries when tenant is not set' do
+        MultiTenant.without do
+          expected_join_sql = <<-SQL.strip
+            SELECT "projects".* FROM "projects" INNER JOIN "tasks" ON "tasks"."project_id" = "projects"."id" AND "projects"."account_id" = "tasks"."account_id"
+          SQL
+          expect(Project.joins(:tasks).to_sql).to eq(expected_join_sql)
+        end
+      end
+    end
+  end
+
   # ::with
   describe "::with" do
     it "should set current_tenant to the specified tenant inside the block" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Citus Data
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -154,12 +154,10 @@ files:
 - activerecord-multi-tenant.gemspec
 - docker-compose.yml
 - gemfiles/.bundle/config
-- gemfiles/active_record_5.2.3.gemfile
 - gemfiles/active_record_5.2.gemfile
 - gemfiles/active_record_6.0.gemfile
 - gemfiles/active_record_6.1.gemfile
 - gemfiles/active_record_7.0.gemfile
-- gemfiles/rails_5.2.3.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile

data/gemfiles/active_record_5.2.3.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "activerecord", "~> 5.2.0", "< 5.2.4" # FIXME
-gem "i18n", "~> 0.9.5"
-gem "nokogiri", "~> 1.7.1"
-gem "nio4r", "~> 2.3.1"
-gem "sprockets", "~> 3.7.1"
-gem "byebug", "~> 11.0"
-gem "rake", "12.0.0"
-gem "redis", "3.3.3"
-gem "pry-byebug", "3.9.0"
-
-gemspec path: "../"

data/gemfiles/rails_5.2.3.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "rails", "~> 5.2.0", "< 5.2.4" # FIXME
-gem "i18n", "~> 0.9.5"
-gem "nokogiri", "~> 1.7.1"
-gem "nio4r", "~> 2.3.1"
-gem "sprockets", "~> 3.7.1"
-gem "byebug", "~> 11.0"
-gem "rake", "12.0.0"
-gem "redis", "3.3.3"
-gem "pry-byebug", "3.9.0"
-
-gemspec path: "../"