activerecord-multi-tenant 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 366debe159c5693b73fbca961fae7889febd5e00
-  data.tar.gz: 3670f0bd43e9074463c44e397ccbc1f25246bd4d
+SHA256:
+  metadata.gz: 63718531a69f576dfff1966daa127d22a90501d8d367c59cfa14ed60f0e11d11
+  data.tar.gz: d19ff33cd3ba08237015186e87a5c92910292561962e3fde49e128b341067eea
 SHA512:
-  metadata.gz: 9274691cbc15fcba204a5b9fcd01e550aefddcf3b0b37ec1aa329a66637dffb8e22d08b6fd9e55f63d42b2582146d544552921f8558722b047f31fb8f66fb9f1
-  data.tar.gz: 8e162537b956585c28734850d8f189433d8337854df10c9a1bf16637000c9c448eed6739763c8e20a488edf7d43743ea84254a137f0d77c6b7c84318a10d3c4b
+  metadata.gz: 959702bc65ece2ca74c92e7a2e07f2429c2aba56c5c64517b5625aab2ccd2efe1eb7639a7070c08ad617e63a3fc218a07f0ff4d4383598304108467dc31434cb
+  data.tar.gz: 2eefe3dd780f6bd2ad1ead39e23ed185db777ec3cf84257b29c370e4f774cd80650435cdb3a86a9d25561d53dfaab3e5e28ee1147a5dabe6119ef7acca118a17

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+
+## 0.11.0      2019-06-12
+
+* Fix queries with joins by including the tenant column when current tenant isn't set
+  - A common use case is having a filter on the tenant, but `MultiTenant.with` isn't used like `Project.where(account_id: 1).eager_load(:categories)`. This version fixes the ORM call to include in the `join`: `"project_categories"."account_id" = "projects"."account_id"`
+
+
 ## 0.10.0      2019-05-31
 
 * Add `MultiTenant.without` to remove already set tenant context in a block [#45](https://github.com/citusdata/activerecord-multi-tenant/pull/45) [Jackson Miller](https://github.com/jaxn)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-multi-tenant (0.10.0)
+    activerecord-multi-tenant (0.11.0)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
@@ -49,7 +49,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.1.0)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
@@ -180,4 +180,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   2.0.1
+   1.16.4

data/gemfiles/active_record_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.9.0)
+    activerecord-multi-tenant (0.11.0)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
@@ -57,18 +57,18 @@ GEM
     connection_pool (2.2.1)
     diff-lcs (1.3)
     erubi (1.6.0)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (0.8.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     method_source (0.8.2)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    nio4r (2.3.0)
+    nio4r (2.3.1)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     pg (0.20.0)
@@ -138,7 +138,7 @@ GEM
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -151,7 +151,7 @@ GEM
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
 
 PLATFORMS
   ruby
@@ -170,4 +170,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/gemfiles/active_record_5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.9.0)
+    activerecord-multi-tenant (0.11.0)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
@@ -62,20 +62,20 @@ GEM
     crass (1.0.4)
     diff-lcs (1.3)
     erubi (1.7.1)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.0)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     nio4r (2.3.1)
@@ -158,9 +158,9 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
 
 PLATFORMS
   ruby
@@ -179,4 +179,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/gemfiles/rails_4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.9.0)
+    activerecord-multi-tenant (0.11.0)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
@@ -138,4 +138,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/gemfiles/rails_4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.9.0)
+    activerecord-multi-tenant (0.11.0)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
@@ -143,4 +143,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.9.0)
+    activerecord-multi-tenant (0.11.0)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
@@ -166,4 +166,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.9.0)
+    activerecord-multi-tenant (0.11.0)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
@@ -172,4 +172,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.9.0)
+    activerecord-multi-tenant (0.11.0)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
@@ -172,4 +172,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.9.0)
+    activerecord-multi-tenant (0.11.0)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
@@ -179,4 +179,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

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

@@ -84,6 +84,10 @@ module MultiTenant
       @current_context.visited_handled_relation(o.tenant_attribute.relation)
     end
 
+    def visit_MultiTenant_TenantJoinEnforcementClause(o, *)
+      @current_context.visited_handled_relation(o.tenant_attribute.relation)
+    end
+
     def visit_Arel_Table(o, _collector = nil)
       @current_context.visited_relation(o) if tenant_relation?(o.table_name)
     end
@@ -169,15 +173,49 @@ module MultiTenant
     end
   end
 
+
+  class TenantJoinEnforcementClause < Arel::Nodes::Node
+    attr_reader :tenant_attribute
+    attr_reader :table_left
+    def initialize(tenant_attribute, table_left)
+      @table_left = table_left
+      @model_left = MultiTenant.multi_tenant_model_for_table(table_left.table_name)
+      @tenant_attribute = tenant_attribute
+    end
+
+    def to_s; to_sql; end
+    def to_str; to_sql; end
+
+    def to_sql(*)
+      tenant_arel.to_sql
+    end
+
+    private
+
+    def tenant_arel
+      @tenant_attribute.eq(@table_left[@model_left.partition_key])
+    end
+  end
+
+
   module TenantValueVisitor
     if ActiveRecord::VERSION::MAJOR > 4 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2)
       def visit_MultiTenant_TenantEnforcementClause(o, collector)
         collector << o
       end
+
+      def visit_MultiTenant_TenantJoinEnforcementClause(o, collector)
+        collector << o
+      end
+
     else
       def visit_MultiTenant_TenantEnforcementClause(o, a = nil)
         o
       end
+
+      def visit_MultiTenant_TenantJoinEnforcementClause(o, a = nil)
+        o
+      end
     end
   end
 
@@ -232,25 +270,53 @@ module ActiveRecord
     def build_arel(*args)
       arel = build_arel_orig(*args)
 
-      if MultiTenant.current_tenant_id && !MultiTenant.with_write_only_mode_enabled?
+      if !MultiTenant.with_write_only_mode_enabled?
         visitor = MultiTenant::ArelTenantVisitor.new(arel)
+
         visitor.contexts.each do |context|
           node = context.arel_node
+
           context.unhandled_relations.each do |relation|
             model = MultiTenant.multi_tenant_model_for_table(relation.arel_table.table_name)
-            enforcement_clause = MultiTenant::TenantEnforcementClause.new(relation.arel_table[model.partition_key])
-
-            case node
-            when Arel::Nodes::Join #Arel::Nodes::OuterJoin, Arel::Nodes::RightOuterJoin, Arel::Nodes::FullOuterJoin
-              node.right.expr = node.right.expr.and(enforcement_clause)
-            when Arel::Nodes::SelectCore
-              if node.wheres.empty?
-                node.wheres = [enforcement_clause]
+
+            if MultiTenant.current_tenant_id
+              enforcement_clause = MultiTenant::TenantEnforcementClause.new(relation.arel_table[model.partition_key])
+              case node
+              when Arel::Nodes::Join #Arel::Nodes::OuterJoin, Arel::Nodes::RightOuterJoin, Arel::Nodes::FullOuterJoin
+                node.right.expr = node.right.expr.and(enforcement_clause)
+              when Arel::Nodes::SelectCore
+                if node.wheres.empty?
+                  node.wheres = [enforcement_clause]
+                else
+                  node.wheres[0] = enforcement_clause.and(node.wheres[0])
+                end
               else
-                node.wheres[0] = enforcement_clause.and(node.wheres[0])
+                raise "UnknownContext"
+              end
+            end
+
+            if node.is_a?(Arel::Nodes::SelectCore) || node.is_a?(Arel::Nodes::Join)
+
+              if node.is_a?Arel::Nodes::Join
+                node_list = [node]
+              else
+                node_list = node.source.right
+              end
+
+              node_list.select{ |n| n.is_a? Arel::Nodes::Join }.each do |node_join|
+                if !node_join.right || !node_join.right.expr.right.is_a?(Arel::Attributes::Attribute)
+                  next
+                end
+
+                relation_right = node_join.right.expr.right.relation
+                relation_left = node_join.right.expr.left.relation
+                model_left = MultiTenant.multi_tenant_model_for_table(relation_right.table_name)
+                model_right = MultiTenant.multi_tenant_model_for_table(relation_left.table_name)
+                if model_right && model_left
+                  join_enforcement_clause = MultiTenant::TenantJoinEnforcementClause.new(relation_left[model_left.partition_key], relation_right)
+                  node_join.right.expr = node_join.right.expr.and(join_enforcement_clause)
+                end
               end
-            else
-              raise "UnknownContext"
             end
           end
         end

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

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

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

@@ -345,11 +345,15 @@ describe MultiTenant do
   it "applies the team_id conditions in the where clause" do
     expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR < 2
                      <<-sql
-                     SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" WHERE "tasks"."account_id" = 1 AND "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = $1
+                     SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" AND "sub_tasks"."account_id" = "tasks"."account_id" WHERE "tasks"."account_id" = 1 AND "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = $1
+                     sql
+                   elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 0
+                     <<-sql
+                     SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" AND "sub_tasks"."account_id" = "tasks"."account_id" WHERE "tasks"."account_id" = 1 AND "tasks"."project_id" = 1
                      sql
                    else
                      <<-sql
-                     SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" WHERE "tasks"."account_id" = 1 AND "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = 1
+                     SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" AND "sub_tasks"."account_id" = "tasks"."account_id" WHERE "tasks"."account_id" = 1 AND "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = 1
                      sql
                    end
     account1 = Account.create! name: 'Account 1'
@@ -362,8 +366,152 @@ describe MultiTenant do
       expect(project1.sub_tasks.to_sql).to eq(expected_sql.strip)
       expect(project1.sub_tasks).to include(subtask1)
     end
+
+    MultiTenant.without do
+      expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR < 2
+                       <<-sql
+                     SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" AND "sub_tasks"."account_id" = "tasks"."account_id" WHERE "tasks"."project_id" = $1
+                     sql
+                     else
+                       <<-sql
+                     SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" AND "sub_tasks"."account_id" = "tasks"."account_id" WHERE "tasks"."project_id" = 1
+                     sql
+                     end
+
+      project = Project.first
+      expect(project.sub_tasks.to_sql).to eq(expected_sql.strip)
+    end
   end
 
+  it "tests joins between distributed and reference table" do
+    expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR < 2
+                     <<-sql
+                     SELECT "categories".* FROM "categories" INNER JOIN "project_categories" ON "categories"."id" = "project_categories"."category_id" WHERE "project_categories"."account_id" = 1 AND "project_categories"."project_id" = $1
+                     sql
+                   else
+                     <<-sql
+                     SELECT "categories".* FROM "categories" INNER JOIN "project_categories" ON "categories"."id" = "project_categories"."category_id" WHERE "project_categories"."account_id" = 1 AND "project_categories"."project_id" = 1
+                     sql
+                   end
+    account1 = Account.create! name: 'Account 1'
+    category1 = Category.create! name: 'Category 1'
+
+    MultiTenant.with(account1) do
+      project1 = Project.create! name: 'Project 1'
+      projectcategory = ProjectCategory.create! name: 'project cat 1', project: project1, category: category1
+      expect(project1.categories.to_sql).to eq(expected_sql.strip)
+      expect(project1.categories).to include(category1)
+      expect(project1.project_categories).to include(projectcategory)
+    end
+
+    MultiTenant.without do
+      expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR < 2
+                       <<-sql
+                     SELECT "categories".* FROM "categories" INNER JOIN "project_categories" ON "categories"."id" = "project_categories"."category_id" WHERE "project_categories"."project_id" = $1
+                     sql
+                     else
+                       <<-sql
+                     SELECT "categories".* FROM "categories" INNER JOIN "project_categories" ON "categories"."id" = "project_categories"."category_id" WHERE "project_categories"."project_id" = 1
+                     sql
+                     end
+      project = Project.first
+      expect(project.categories.to_sql).to eq(expected_sql.strip)
+      expect(project.categories).to include(category1)
+
+      expected_sql = <<-sql
+                        SELECT "projects".* FROM "projects" INNER JOIN "project_categories" ON "project_categories"."project_id" = "projects"."id" AND "project_categories"."account_id" = "projects"."account_id" INNER JOIN "categories" ON "categories"."id" = "project_categories"."category_id" WHERE "projects"."account_id" = 1
+                     sql
+
+      expect(Project.where(account_id: 1).joins(:categories).to_sql).to eq(expected_sql.strip)
+      project = Project.where(account_id: 1).joins(:categories).first
+      expect(project.categories).to include(category1)
+    end
+  end
+
+
+  it "test eager_load" do
+    account1 = Account.create! name: 'Account 1'
+    category1 = Category.create! name: 'Category 1'
+
+    expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR > 1
+                     <<-sql
+                     SELECT "projects"."id" AS t0_r0, "projects"."account_id" AS t0_r1, "projects"."name" AS t0_r2, "categories"."id" AS t1_r0, "categories"."name" AS t1_r1 FROM "projects" LEFT OUTER JOIN "project_categories" ON "project_categories"."project_id" = "projects"."id" AND "project_categories"."account_id" = 1 AND "projects"."account_id" = 1 LEFT OUTER JOIN "categories" ON "categories"."id" = "project_categories"."category_id" AND "project_categories"."account_id" = 1 WHERE "projects"."account_id" = 1
+                     sql
+                   elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0
+                     <<-sql
+                     SELECT "projects".* FROM "projects"  WHERE "projects"."account_id" = 1
+                     sql
+                   else
+                     <<-sql
+                     SELECT "projects"."id" AS t0_r0, "projects"."account_id" AS t0_r1, "projects"."name" AS t0_r2, "categories"."id" AS t1_r0, "categories"."name" AS t1_r1 FROM "projects" LEFT OUTER JOIN "project_categories" ON "project_categories"."project_id" = "projects"."id" AND "project_categories"."account_id" = "projects"."account_id" AND "project_categories"."account_id" = 1 AND "projects"."account_id" = 1 LEFT OUTER JOIN "categories" ON "categories"."id" = "project_categories"."category_id" AND "project_categories"."account_id" = 1 WHERE "projects"."account_id" = 1
+                     sql
+                   end
+
+    MultiTenant.with(account1) do
+      project1 = Project.create! name: 'Project 1'
+      projectcategory = ProjectCategory.create! name: 'project cat 1', project: project1, category: category1
+
+      expect(Project.eager_load(:categories).to_sql).to eq(expected_sql.strip)
+
+      project = Project.eager_load(:categories).first
+      expect(project.categories).to include(category1)
+      expect(project.project_categories).to include(projectcategory)
+    end
+
+    MultiTenant.without do
+      expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0
+                       <<-sql
+                       SELECT "projects".* FROM "projects"  WHERE "projects"."account_id" = 1
+                       sql
+                     else
+                       <<-sql
+                     SELECT "projects"."id" AS t0_r0, "projects"."account_id" AS t0_r1, "projects"."name" AS t0_r2, "categories"."id" AS t1_r0, "categories"."name" AS t1_r1 FROM "projects" LEFT OUTER JOIN "project_categories" ON "project_categories"."project_id" = "projects"."id" AND "project_categories"."account_id" = "projects"."account_id" LEFT OUTER JOIN "categories" ON "categories"."id" = "project_categories"."category_id" WHERE "projects"."account_id" = 1
+                       sql
+                     end
+
+      expect(Project.where(account_id: 1).eager_load(:categories).to_sql).to eq(expected_sql.strip)
+
+      project = Project.where(account_id: 1).eager_load(:categories).first
+      expect(project.categories).to include(category1)
+
+    end
+  end
+
+  it "test raw SQL joins" do
+    account1 = Account.create! name: 'Account 1'
+    category1 = Category.create! name: 'Category 1'
+
+    MultiTenant.with(account1) do
+      expected_sql =  if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR > 1
+                        <<-sql
+                        SELECT "tasks".* FROM "tasks" INNER JOIN "projects" ON "projects"."id" = "tasks"."project_id" AND "projects"."account_id" = 1 LEFT JOIN project_categories pc ON project.category_id = pc.id WHERE "tasks"."account_id" = 1
+                        sql
+                      else
+                        <<-sql
+                        SELECT "tasks".* FROM "tasks" INNER JOIN "projects" ON "projects"."id" = "tasks"."project_id" AND "projects"."account_id" = "tasks"."account_id" LEFT JOIN project_categories pc ON project.category_id = pc.id WHERE "projects"."account_id" = 1 AND "tasks"."account_id" = 1
+                        sql
+                      end
+
+      project1 = Project.create! name: 'Project 1'
+      projectcategory = ProjectCategory.create! name: 'project cat 1', project: project1, category: category1
+
+      project1.tasks.create! name: 'baz'
+
+      expect(Task.joins(:project).joins('LEFT JOIN project_categories pc ON project.category_id = pc.id').to_sql).to eq(expected_sql.strip)
+    end
+
+    MultiTenant.without do
+      expected_sql = <<-sql
+                     SELECT "tasks".* FROM "tasks" INNER JOIN "projects" ON "projects"."id" = "tasks"."project_id" AND "projects"."account_id" = "tasks"."account_id" LEFT JOIN project_categories pc ON project.category_id = pc.id WHERE "tasks"."account_id" = 1
+                     sql
+      expect(Task.where(account_id: 1).joins(:project).joins('LEFT JOIN project_categories pc ON project.category_id = pc.id').to_sql).to eq(expected_sql.strip)
+
+    end
+
+  end
+
+
+
   # Versions earlier than 4.2 pass an arel object to find_by_sql(...) and it would make
   # this test unnecesssarily complicated to support that
   if ActiveRecord::VERSION::MAJOR > 4 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2)

data/spec/schema.rb

@@ -78,6 +78,17 @@ ARGV.grep(/\w+_spec\.rb/).empty? && ActiveRecord::Schema.define(version: 1) do
     t.column :description, :string
   end
 
+  create_table :categories, force: true do |t|
+    t.column :name, :string
+  end
+
+  create_table :project_categories, force: true, partition_key: :account_id do |t|
+    t.column :name, :string
+    t.column :account_id, :integer
+    t.column :project_id, :integer
+    t.column :category_id, :integer
+  end
+
   create_distributed_table :accounts, :id
   create_distributed_table :projects, :account_id
   create_distributed_table :managers, :account_id
@@ -89,6 +100,8 @@ ARGV.grep(/\w+_spec\.rb/).empty? && ActiveRecord::Schema.define(version: 1) do
   create_distributed_table :partition_key_not_model_tasks, :non_model_id
   create_distributed_table :subclass_tasks, :non_model_id
   create_distributed_table :uuid_records, :organization_id
+  create_distributed_table :project_categories, :account_id
+  create_reference_table :categories
 end
 
 class Account < ActiveRecord::Base
@@ -103,6 +116,9 @@ class Project < ActiveRecord::Base
   has_many :tasks
   has_many :sub_tasks, through: :tasks
 
+  has_many :project_categories
+  has_many :categories, through: :project_categories
+
   validates_uniqueness_of :name, scope: [:account]
 end
 
@@ -171,3 +187,15 @@ end
 class UuidRecord < ActiveRecord::Base
   multi_tenant :organization
 end
+
+class Category < ActiveRecord::Base
+  has_many  :project_categories
+  has_many :projects, through: :project_categories
+end
+
+class ProjectCategory < ActiveRecord::Base
+  multi_tenant :account
+  belongs_to :project
+  belongs_to :category
+  belongs_to :account
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Citus Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -226,8 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord/Rails integration for multi-tenant databases, in particular