activerecord-multi-tenant 1.0.4 → 1.2.0

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

@@ -1,4 +1,5 @@
 require 'active_record'
+require_relative "./arel_visitors_depth_first.rb" unless Arel::Visitors.const_defined?(:DepthFirst)
 
 module MultiTenant
   class Table
@@ -31,6 +32,7 @@ module MultiTenant
       @arel_node = arel_node
       @known_relations = []
       @handled_relations = []
+      @discovering = false
     end
 
     def discover_relations
@@ -54,7 +56,7 @@ module MultiTenant
     end
   end
 
-  class ArelTenantVisitor < Arel::Visitors::DepthFirst
+  class ArelTenantVisitor < Arel::Visitors.const_defined?(:DepthFirst) ? Arel::Visitors::DepthFirst : ::MultiTenant::ArelVisitorsDepthFirst
     def initialize(arel)
       super(Proc.new {})
       @statement_node_id = nil
@@ -120,6 +122,8 @@ module MultiTenant
     alias :visit_Arel_Nodes_FullOuterJoin :visit_Arel_Nodes_OuterJoin
     alias :visit_Arel_Nodes_RightOuterJoin :visit_Arel_Nodes_OuterJoin
 
+    alias :visit_ActiveModel_Attribute :terminal
+
     private
 
     def tenant_relation?(table_name)
@@ -224,22 +228,20 @@ module MultiTenant
       delete
     end
 
-    if (ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 2) || ActiveRecord::VERSION::MAJOR > 5
-      def update(arel, name = nil, binds = [])
-        model = MultiTenant.multi_tenant_model_for_arel(arel)
-        if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
-          arel.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
-        end
-        super(arel, name, binds)
+    def update(arel, name = nil, binds = [])
+      model = MultiTenant.multi_tenant_model_for_arel(arel)
+      if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
+        arel.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
       end
+      super(arel, name, binds)
+    end
 
-      def delete(arel, name = nil, binds = [])
-        model = MultiTenant.multi_tenant_model_for_arel(arel)
-        if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
-          arel.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
-        end
-        super(arel, name, binds)
+    def delete(arel, name = nil, binds = [])
+      model = MultiTenant.multi_tenant_model_for_arel(arel)
+      if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
+        arel.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
       end
+      super(arel, name, binds)
     end
   end
 end
@@ -274,7 +276,11 @@ module ActiveRecord
                 if node.wheres.empty?
                   node.wheres = [enforcement_clause]
                 else
-                  node.wheres[0] = enforcement_clause.and(node.wheres[0])
+                  if node.wheres[0].is_a?(Arel::Nodes::And)
+                    node.wheres[0].children << enforcement_clause
+                  else
+                    node.wheres[0] = enforcement_clause.and(node.wheres[0])
+                  end
                 end
               else
                 raise "UnknownContext"
@@ -290,7 +296,7 @@ module ActiveRecord
 
               node_list.select{ |n| n.is_a? Arel::Nodes::Join }.each do |node_join|
                 if (!node_join.right ||
-                    (ActiveRecord::VERSION::MAJOR <= 5 &&
+                    (ActiveRecord::VERSION::MAJOR == 5 &&
                      !node_join.right.expr.right.is_a?(Arel::Attributes::Attribute)))
                   next
                 end
@@ -316,7 +322,7 @@ module ActiveRecord
 
     private
     def relations_from_node_join(node_join)
-      if ActiveRecord::VERSION::MAJOR <= 5 || node_join.right.expr.is_a?(Arel::Nodes::Equality)
+      if ActiveRecord::VERSION::MAJOR == 5 || node_join.right.expr.is_a?(Arel::Nodes::Equality)
         return node_join.right.expr.right.relation, node_join.right.expr.left.relation
       end
 
@@ -327,71 +333,22 @@ module ActiveRecord
         return nil, nil
       end
 
-      return children[0].right.relation, children[0].left.relation
+      if children[0].right.respond_to?('relation') && children[0].left.respond_to?('relation')
+        return children[0].right.relation, children[0].left.relation
+      end
+
+      return nil, nil
     end
   end
 end
 
 require 'active_record/base'
 module MultiTenantFindBy
-  if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2
-    # Disable caching for find and find_by in Rails 4.2 - we don't have a good
-    # way to prevent caching problems here when prepared statements are enabled
-    def find_by(*args)
-      return super unless respond_to?(:scoped_by_tenant?) && scoped_by_tenant?
-
-      # This duplicates a bunch of code from AR's find() method
-      return super if current_scope || !(Hash === args.first) || reflect_on_all_aggregations.any?
-      return super if default_scopes.any?
-
-      hash = args.first
-
-      return super if hash.values.any? { |v| v.nil? || Array === v || Hash === v }
-      return super unless hash.keys.all? { |k| columns_hash.has_key?(k.to_s) }
-
-      key = hash.keys
+  def cached_find_by_statement(key, &block)
+    return super unless respond_to?(:scoped_by_tenant?) && scoped_by_tenant?
 
-      # Ensure we never use the cached version
-      find_by_statement_cache.synchronize { find_by_statement_cache[key] = nil }
-
-      super
-    end
-
-    def find(*ids)
-      return super unless respond_to?(:scoped_by_tenant?) && scoped_by_tenant?
-
-      # This duplicates a bunch of code from AR's find() method
-      return super unless ids.length == 1
-      return super if ids.first.kind_of?(Symbol)
-      return super if block_given? ||
-                      primary_key.nil? ||
-                      default_scopes.any? ||
-                      current_scope ||
-                      columns_hash.include?(inheritance_column) ||
-                      ids.first.kind_of?(Array)
-
-      id = ids.first
-        if ActiveRecord::Base === id
-          id = id.id
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            You are passing an instance of ActiveRecord::Base to `find`.
-            Please pass the id of the object by calling `.id`
-          MSG
-        end
-      key = primary_key
-
-      # Ensure we never use the cached version
-      find_by_statement_cache.synchronize { find_by_statement_cache[key] = nil }
-
-      super
-    end
-  elsif ActiveRecord::VERSION::MAJOR > 4
-    def cached_find_by_statement(key, &block)
-      return super unless respond_to?(:scoped_by_tenant?) && scoped_by_tenant?
-
-      key = Array.wrap(key) + [MultiTenant.current_tenant_id.to_s]
-      super(key, &block)
-    end
+    key = Array.wrap(key) + [MultiTenant.current_tenant_id.to_s]
+    super(key, &block)
   end
 end
 

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

@@ -18,7 +18,12 @@ module Sidekiq::Middleware::MultiTenant
   class Server
     def call(worker_class, msg, queue)
       if msg.has_key?('multi_tenant')
-        MultiTenant.with(msg['multi_tenant']['id']) do
+        tenant = begin
+                   msg['multi_tenant']['class'].constantize.find(msg['multi_tenant']['id'])
+                 rescue ActiveRecord::RecordNotFound
+                   msg['multi_tenant']['id']
+                 end
+        MultiTenant.with(tenant) do
           yield
         end
       else

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

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '1.0.4'
+  VERSION = '1.2.0'
 end

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

@@ -21,11 +21,7 @@ describe "Controller Extensions", type: :controller do
   describe ApplicationController, type: :controller do
     controller do
       def index
-        if ActionPack::VERSION::MAJOR >= 5
-          render body: 'custom called'
-        else
-          render text: 'custom called'
-        end
+        render body: 'custom called'
       end
     end
 
@@ -35,30 +31,29 @@ describe "Controller Extensions", type: :controller do
     end
   end
 
-  if ActionPack::VERSION::MAJOR >= 5
-    class APIApplicationController < ActionController::API
-      include Rails.application.routes.url_helpers
-      set_current_tenant_through_filter
-      before_action :your_method_that_finds_the_current_tenant
 
-      def your_method_that_finds_the_current_tenant
-        current_account = Account.new
-        current_account.name = 'account1'
-        set_current_tenant(current_account)
-      end
+  class APIApplicationController < ActionController::API
+    include Rails.application.routes.url_helpers
+    set_current_tenant_through_filter
+    before_action :your_method_that_finds_the_current_tenant
+
+    def your_method_that_finds_the_current_tenant
+      current_account = Account.new
+      current_account.name = 'account1'
+      set_current_tenant(current_account)
     end
+  end
 
-    describe APIApplicationController, type: :controller do
-      controller do
-        def index
-          render body: 'custom called'
-        end
+  describe APIApplicationController, type: :controller do
+    controller do
+      def index
+        render body: 'custom called'
       end
+    end
 
-      it 'Finds the correct tenant using the filter command' do
-        get :index
-        expect(MultiTenant.current_tenant.name).to eq 'account1'
-      end
+    it 'Finds the correct tenant using the filter command' do
+      get :index
+      expect(MultiTenant.current_tenant.name).to eq 'account1'
     end
   end
 end

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

@@ -348,9 +348,12 @@ describe MultiTenant do
   end
 
   it "applies the team_id conditions in the where clause" do
-    expected_sql = <<-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 "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = 1
-                     sql
+    option1 = <<-sql.strip
+      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 AND "sub_tasks"."account_id" = 1 AND "tasks"."account_id" = 1
+    sql
+    option2 = <<-sql.strip
+      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 "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = 1 AND "tasks"."account_id" = 1
+    sql
 
     account1 = Account.create! name: 'Account 1'
 
@@ -358,7 +361,7 @@ describe MultiTenant do
       project1 = Project.create! name: 'Project 1'
       task1 = Task.create! name: 'Task 1', project: project1
       subtask1 = SubTask.create! task: task1
-      expect(project1.sub_tasks.to_sql).to eq(expected_sql.strip)
+      expect(project1.sub_tasks.to_sql).to eq(option1).or(eq(option2))
       expect(project1.sub_tasks).to include(subtask1)
     end
 
@@ -373,9 +376,13 @@ describe MultiTenant do
   end
 
   it "tests joins between distributed and reference table" do
-    expected_sql = <<-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
+    option1 = <<-sql.strip
+      SELECT "categories".* FROM "categories" INNER JOIN "project_categories" ON "categories"."id" = "project_categories"."category_id" WHERE "project_categories"."project_id" = 1 AND "project_categories"."account_id" = 1
+    sql
+    option2 = <<-sql.strip
+      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
+
     account1 = Account.create! name: 'Account 1'
     category1 = Category.create! name: 'Category 1'
 
@@ -383,7 +390,7 @@ describe MultiTenant 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_sql).to eq(option1).or(eq(option2))
       expect(project1.categories).to include(category1)
       expect(project1.project_categories).to include(projectcategory)
     end
@@ -412,25 +419,18 @@ describe MultiTenant 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 > 0
-                     <<-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 == 6
-                     <<-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"."account_id" = 1 AND "project_categories"."project_id" = "projects"."id" 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
-                   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
+    option1 = <<-sql.strip
+      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
+    option2 = <<-sql.strip
+      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"."account_id" = 1 AND "project_categories"."project_id" = "projects"."id" 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
 
     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)
+      expect(Project.eager_load(:categories).to_sql).to eq(option1).or(eq(option2))
 
       project = Project.eager_load(:categories).first
       expect(project.categories).to include(category1)
@@ -455,25 +455,18 @@ describe MultiTenant do
     category1 = Category.create! name: 'Category 1'
 
     MultiTenant.with(account1) do
-      expected_sql =  if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR > 0
-                        <<-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
-                      elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 6
-                        <<-sql
-                        SELECT "tasks".* FROM "tasks" INNER JOIN "projects" ON "projects"."account_id" = 1 AND "projects"."id" = "tasks"."project_id" 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
+      option1 = <<-sql.strip
+        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
+      option2 = <<-sql.strip
+        SELECT "tasks".* FROM "tasks" INNER JOIN "projects" ON "projects"."account_id" = 1 AND "projects"."id" = "tasks"."project_id" LEFT JOIN project_categories pc ON project.category_id = pc.id WHERE "tasks"."account_id" = 1
+      sql
 
       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)
+      expect(Task.joins(:project).joins('LEFT JOIN project_categories pc ON project.category_id = pc.id').to_sql).to eq(option1).or(eq(option2))
     end
 
     MultiTenant.without do
@@ -493,48 +486,39 @@ describe MultiTenant do
     project2 = Project.create! name: 'Project 2', account: Account.create!(name: 'Account2')
 
     MultiTenant.with(account) do
-      expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR > 5
-                       <<-sql.strip
-                                SELECT "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT $2
-                         sql
-                     elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR > 4
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT $2
-                         sql
-                     elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT 1
-                         sql
-                     else
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = #{project.id} LIMIT 1
-                         sql
-                     end
-
-      expect(Project).to receive(:find_by_sql).with(expected_sql, any_args).and_call_original
+      option1 = <<-sql.strip
+        SELECT "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT $2
+      sql
+      option2 = <<-sql.strip
+        SELECT "projects".* FROM "projects" WHERE "projects"."id" = $1 AND "projects"."account_id" = #{account.id} LIMIT $2
+      sql
+      option3 = <<-sql.strip
+        SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 AND "projects"."account_id" = #{account.id} LIMIT $2
+      sql
+
+      # Couldn't make the following line pass for some reason, so came up with an uglier alternative
+      # expect(Project).to receive(:find_by_sql).with(eq(option1).or(eq(option2)).or(eq(option3)), any_args).and_call_original
+      expect(Project).to receive(:find_by_sql).and_wrap_original do |m, *args|
+        expect(args[0]).to(eq(option1).or(eq(option2)).or(eq(option3)))
+        m.call(args[0], args[1], preparable:args[2][:preparable])
+      end
       expect(Project.find(project.id)).to eq(project)
     end
 
     MultiTenant.without do
-      expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR > 5
-                       <<-sql.strip
-                         SELECT "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
-                         sql
-                     elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR > 4
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
-                         sql
-                     elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT 1
-                         sql
-                     else
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."id" = #{project2.id} LIMIT 1
-                         sql
-                     end
-
-      expect(Project).to receive(:find_by_sql).with(expected_sql, any_args).and_call_original
+      option1 = <<-sql.strip
+        SELECT "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
+      sql
+      option2 = <<-sql.strip
+        SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
+      sql
+
+      # Couldn't make the following line pass for some reason, so came up with an uglier alternative
+      # expect(Project).to receive(:find_by_sql).with(eq(option1).or(eq(option2)), any_args).and_call_original
+      expect(Project).to receive(:find_by_sql).and_wrap_original do |m, *args|
+        expect(args[0]).to(eq(option1).or(eq(option2)))
+        m.call(args[0], args[1], preparable:args[2][:preparable])
+      end
       expect(Project.find(project2.id)).to eq(project2)
     end
   end

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

@@ -90,4 +90,29 @@ describe "Query Rewriter" do
       }.to change { Project.count }.from(3).to(1)
     end
   end
+
+  context "when update without arel" do
+    it "can call method" do
+      expect {
+        ActiveRecord::Base.connection.update("SELECT 1")
+      }.not_to raise_error
+    end
+  end
+
+  context "when joining with a model with a default scope" do
+    let!(:account) { Account.create!(name: "Test Account") }
+
+    it "fetches only records within the default scope" do
+      alive = Domain.create(name: "alive", account: account)
+      deleted = Domain.create(name: "deleted", deleted: true, account: account)
+      page_in_alive_domain = Page.create(name: "alive", account: account, domain: alive)
+      page_in_deleted_domain = Page.create(name: "deleted", account: account, domain: deleted)
+
+      expect(
+        MultiTenant.with(account) do
+          Page.joins(:domain).pluck(:id)
+        end
+      ).to eq([page_in_alive_domain.id])
+    end
+  end
 end

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

@@ -59,4 +59,40 @@ describe MultiTenant, 'Record finding' do
       expect(second_found).to eq(second_record)
     end
   end
+
+  context 'model with has_many relation through multi-tenant model' do
+    let(:tenant_1) { Account.create! name: 'Tenant 1' }
+    let(:project_1) { tenant_1.projects.create! }
+
+    let(:tenant_2) { Account.create! name: 'Tenant 2' }
+    let(:project_2) { tenant_2.projects.create! }
+
+    let(:category) { Category.create! name: 'Category' }
+
+    before do
+      ProjectCategory.create! account: tenant_1, name: '1', project: project_1, category: category
+      ProjectCategory.create! account: tenant_2, name: '2', project: project_2, category: category
+    end
+
+    it 'can get model without creating query cache' do
+      MultiTenant.with(tenant_1) do
+        found_category = Project.find(project_1.id).categories.to_a.first
+        expect(found_category).to eq(category)
+      end
+    end
+
+    it 'can get model for other tenant' do
+      MultiTenant.with(tenant_2) do
+        found_category = Project.find(project_2.id).categories.to_a.first
+        expect(found_category).to eq(category)
+      end
+    end
+
+    it 'can get model without current_tenant' do
+      MultiTenant.without do
+        found_category = Project.find(project_2.id).categories.to_a.first
+        expect(found_category).to eq(category)
+      end
+    end
+  end
 end

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

@@ -4,14 +4,25 @@ require 'activerecord-multi-tenant/sidekiq'
 
 describe MultiTenant, 'Sidekiq' do
   let(:server) { Sidekiq::Middleware::MultiTenant::Server.new }
+  let(:account) { Account.create(name: 'test') }
+  let(:deleted_acount) { Account.create(name: 'deleted') }
+
+  before { deleted_acount.destroy! }
 
   describe 'server middleware' do
     it 'sets the multitenant context when provided in message' do
-      tenant_id = 1234
-      server.call(double, {'bogus' => 'message',
-        'multi_tenant' => { 'class' => MultiTenant.current_tenant_class, 'id' => tenant_id}},
+      server.call(double,{'bogus' => 'message',
+        'multi_tenant' => { 'class' => account.class.name, 'id' => account.id}},
+        'bogus_queue') do
+        expect(MultiTenant.current_tenant).to eq(account)
+      end
+    end
+
+    it 'sets the multitenant context (id) even if tenant not found' do
+      server.call(double,{'bogus' => 'message',
+        'multi_tenant' => { 'class' => deleted_acount.class.name, 'id' => deleted_acount.id}},
         'bogus_queue') do
-        expect(MultiTenant.current_tenant).to eq(tenant_id)
+        expect(MultiTenant.current_tenant).to eq(deleted_acount.id)
       end
     end
 

data/spec/schema.rb

@@ -89,10 +89,21 @@ ARGV.grep(/\w+_spec\.rb/).empty? && ActiveRecord::Schema.define(version: 1) do
     t.column :category_id, :integer
   end
 
-
   create_table :allowed_places, force: true, id: false do |t|
-  t.string :account_id, :integer
-  t.string :name, :string
+    t.string :account_id, :integer
+    t.string :name, :string
+  end
+
+  create_table :domains, force: true, partition_key: :account_id do |t|
+    t.column :account_id, :integer
+    t.column :name, :string
+    t.column :deleted, :boolean, default: false
+  end
+
+  create_table :pages, force: true, partition_key: :account_id do |t|
+    t.column :account_id, :integer
+    t.column :name, :string
+    t.column :domain_id, :integer
   end
 
   create_distributed_table :accounts, :id
@@ -108,6 +119,8 @@ ARGV.grep(/\w+_spec\.rb/).empty? && ActiveRecord::Schema.define(version: 1) do
   create_distributed_table :uuid_records, :organization_id
   create_distributed_table :project_categories, :account_id
   create_distributed_table :allowed_places, :account_id
+  create_distributed_table :domains, :account_id
+  create_distributed_table :pages, :account_id
   create_reference_table :categories
 end
 
@@ -181,10 +194,7 @@ end
 class Comment < ActiveRecord::Base
   multi_tenant :account
   belongs_to :commentable, polymorphic: true
-
-  if ActiveRecord::VERSION::MAJOR >= 4
-    belongs_to :task, -> { where(comments: { commentable_type: 'Task'  }) }, foreign_key: 'commentable_id'
-  end
+  belongs_to :task, -> { where(comments: { commentable_type: 'Task'  }) }, foreign_key: 'commentable_id'
 end
 
 class Organization < ActiveRecord::Base
@@ -207,7 +217,17 @@ class ProjectCategory < ActiveRecord::Base
   belongs_to :account
 end
 
-
 class AllowedPlace < ActiveRecord::Base
   multi_tenant :account
 end
+
+class Domain < ActiveRecord::Base
+  multi_tenant :account
+  has_many :pages
+  default_scope { where(deleted: false) }
+end
+
+class Page < ActiveRecord::Base
+  multi_tenant :account
+  belongs_to :domain
+end

data/spec/spec_helper.rb

@@ -43,12 +43,7 @@ MultiTenantTest::Application.config.secret_token = 'x' * 40
 MultiTenantTest::Application.config.secret_key_base = 'y' * 40
 
 def uses_prepared_statements?
-  if ActiveRecord::VERSION::MAJOR == 4
-    config = ActiveRecord::Base.connection.instance_variable_get(:@config)
-    config.fetch(:prepared_statements, true)
-  else
-    ActiveRecord::Base.connection.prepared_statements
-  end
+  ActiveRecord::Base.connection.prepared_statements
 end
 
 require 'schema'