activerecord-multi-tenant 1.0.1 → 1.0.2

data/gemfiles/rails_5.2.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "rails", "5.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (1.0.1)
-      rails (>= 4.0)
+    activerecord-multi-tenant (1.0.2)
+      rails (>= 4.2)
       request_store (>= 1.0.5)
 
 GEM

data/gemfiles/{rails_4.0.gemfile → rails_6.0.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "rails", "4.0.13"
+gem "rails", "6.0.0.rc1"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile.lock

@@ -0,0 +1,198 @@
+PATH
+  remote: ..
+  specs:
+    activerecord-multi-tenant (1.0.2)
+      rails (>= 4.2)
+      request_store (>= 1.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actiontext (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activerecord (6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+    activestorage (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0.rc1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.4)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.3)
+    byebug (11.0.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    connection_pool (2.2.2)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    erubi (1.8.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.5.1)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    pg (1.1.4)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    rack (2.0.7)
+    rack-protection (2.0.7)
+      rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0.rc1)
+      actioncable (= 6.0.0.rc1)
+      actionmailbox (= 6.0.0.rc1)
+      actionmailer (= 6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      actiontext (= 6.0.0.rc1)
+      actionview (= 6.0.0.rc1)
+      activejob (= 6.0.0.rc1)
+      activemodel (= 6.0.0.rc1)
+      activerecord (= 6.0.0.rc1)
+      activestorage (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0.rc1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.2.0)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0.rc1)
+      actionpack (= 6.0.0.rc1)
+      activesupport (= 6.0.0.rc1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (12.3.3)
+    redis (4.1.2)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    sidekiq (6.0.0)
+      connection_pool (>= 2.2.2)
+      rack (>= 2.0.0)
+      rack-protection (>= 2.0.0)
+      redis (>= 4.1.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.1.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-multi-tenant!
+  appraisal
+  pg
+  pry
+  pry-byebug
+  rails (= 6.0.0.rc1)
+  rake
+  rspec (>= 3.0)
+  rspec-rails
+  sidekiq
+  thor
+
+BUNDLED WITH
+   1.17.2

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

@@ -130,12 +130,11 @@ if defined?(ActiveRecord::Base)
   ActiveRecord::Base.extend(MultiTenant::ModelExtensionsClassMethods)
 end
 
-if ActiveRecord::VERSION::MAJOR > 4 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2)
-  class ActiveRecord::Associations::Association
-    alias skip_statement_cache_orig skip_statement_cache?
-    def skip_statement_cache?(*scope)
-      return true if klass.respond_to?(:scoped_by_tenant?) && klass.scoped_by_tenant?
-      skip_statement_cache_orig(*scope)
-    end
+
+class ActiveRecord::Associations::Association
+  alias skip_statement_cache_orig skip_statement_cache?
+  def skip_statement_cache?(*scope)
+    return true if klass.respond_to?(:scoped_by_tenant?) && klass.scoped_by_tenant?
+    skip_statement_cache_orig(*scope)
   end
 end

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

@@ -33,6 +33,14 @@ module MultiTenant
     @@multi_tenant_models[table_name.to_s]
   end
 
+  def self.multi_tenant_model_for_arel(arel)
+    if arel.ast.relation.is_a? Arel::Nodes::JoinSource
+      MultiTenant.multi_tenant_model_for_table(arel.ast.relation.left.table_name)
+    else
+      MultiTenant.multi_tenant_model_for_table(arel.ast.relation.table_name)
+    end
+  end
+
   def self.current_tenant=(tenant)
     RequestStore.store[:current_tenant] = tenant
   end

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

@@ -149,21 +149,27 @@ module MultiTenant
     end
   end
 
-  class TenantEnforcementClause < Arel::Nodes::Node
+  class BaseTenantEnforcementClause < Arel::Nodes::Node
     attr_reader :tenant_attribute
     def initialize(tenant_attribute)
       @tenant_attribute = tenant_attribute
+      @tenant_model = MultiTenant.multi_tenant_model_for_table(tenant_attribute.relation.table_name)
     end
 
     def to_s; to_sql; end
     def to_str; to_sql; end
 
     def to_sql(*)
-      tenant_arel.to_sql
+      collector = Arel::Collectors::SQLString.new
+      collector = @tenant_model.connection.visitor.accept tenant_arel, collector
+      collector.value
     end
 
-    private
 
+  end
+
+  class TenantEnforcementClause < BaseTenantEnforcementClause
+    private
     def tenant_arel
       if defined?(Arel::Nodes::Quoted)
         @tenant_attribute.eq(Arel::Nodes::Quoted.new(MultiTenant.current_tenant_id))
@@ -174,24 +180,15 @@ module MultiTenant
   end
 
 
-  class TenantJoinEnforcementClause < Arel::Nodes::Node
-    attr_reader :tenant_attribute
+  class TenantJoinEnforcementClause < BaseTenantEnforcementClause
     attr_reader :table_left
     def initialize(tenant_attribute, table_left)
+      super(tenant_attribute)
       @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
@@ -199,23 +196,12 @@ module MultiTenant
 
 
   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_TenantEnforcementClause(o, collector)
+      collector << o
+    end
 
-      def visit_MultiTenant_TenantJoinEnforcementClause(o, a = nil)
-        o
-      end
+    def visit_MultiTenant_TenantJoinEnforcementClause(o, collector)
+      collector << o
     end
   end
 
@@ -238,9 +224,9 @@ module MultiTenant
       delete
     end
 
-    if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2
+    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_table(arel.ast.relation.table_name)
+        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
@@ -248,7 +234,7 @@ module MultiTenant
       end
 
       def delete(arel, name = nil, binds = [])
-        model = MultiTenant.multi_tenant_model_for_table(arel.ast.left.table_name)
+        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
@@ -296,7 +282,6 @@ module ActiveRecord
             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
@@ -304,14 +289,18 @@ module ActiveRecord
               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)
+                if (!node_join.right ||
+                    (ActiveRecord::VERSION::MAJOR <= 5 &&
+                     !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)
+                relation_right, relation_left = relations_from_node_join(node_join)
+
+                next unless relation_right && relation_left
+
                 model_right = MultiTenant.multi_tenant_model_for_table(relation_left.table_name)
+                model_left = MultiTenant.multi_tenant_model_for_table(relation_right.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)
@@ -324,6 +313,22 @@ module ActiveRecord
 
       arel
     end
+
+    private
+    def relations_from_node_join(node_join)
+      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
+
+      children = node_join.right.expr.children
+
+      tenant_applied = children.any?(MultiTenant::TenantEnforcementClause) || children.any?(MultiTenant::TenantJoinEnforcementClause)
+      if tenant_applied || children.empty?
+        return nil, nil
+      end
+
+      return children[0].right.relation, children[0].left.relation
+    end
   end
 end
 

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

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

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

@@ -348,11 +348,7 @@ describe MultiTenant do
   end
 
   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" 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
+    expected_sql = if 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
@@ -361,27 +357,21 @@ describe MultiTenant do
                      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'
 
     MultiTenant.with(account1) 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 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
+      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"."project_id" = 1
                      sql
-                     end
 
       project = Project.first
       expect(project.sub_tasks.to_sql).to eq(expected_sql.strip)
@@ -389,43 +379,33 @@ describe MultiTenant do
   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
+    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
-                   end
+                   sql
     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
+      expected_sql = <<-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
+                    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
@@ -442,9 +422,9 @@ describe MultiTenant do
                      <<-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
+                   elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 6
                      <<-sql
-                     SELECT "projects".* FROM "projects"  WHERE "projects"."account_id" = 1
+                     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
@@ -464,15 +444,9 @@ describe MultiTenant do
     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
+      expected_sql = <<-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
+                     sql
 
       expect(Project.where(account_id: 1).eager_load(:categories).to_sql).to eq(expected_sql.strip)
 
@@ -491,6 +465,10 @@ describe MultiTenant do
                         <<-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
@@ -501,7 +479,6 @@ describe MultiTenant do
       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
 
@@ -509,73 +486,76 @@ describe MultiTenant 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
 
+  it "only applies clauses when a tenant is set" do
+    account = Account.create! name: 'Account 1'
+    project = Project.create! name: 'Project 1', account: account
+    project2 = Project.create! name: 'Project 2', account: Account.create!(name: 'Account2')
 
-
-  # 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)
-    it "only applies clauses when a tenant is set" do
-      account = Account.create! name: 'Account 1'
-      project = Project.create! name: 'Project 1', account: account
-      project2 = Project.create! name: 'Project 2', account: Account.create!(name: 'Account2')
-
-      MultiTenant.with(account) do
-        expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR > 4
-                         <<-sql.strip
+    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
+                     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
+                     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
-        expect(Project.find(project.id)).to eq(project)
-      end
+                     end
 
-      MultiTenant.without do
-        expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR > 4
-                         <<-sql.strip
+      expect(Project).to receive(:find_by_sql).with(expected_sql, any_args).and_call_original
+      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
+                     elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4
+                       <<-sql.strip
                          SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT 1
                          sql
-                       else
-                         <<-sql.strip
+                     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
-        expect(Project.find(project2.id)).to eq(project2)
-      end
+                     end
+
+      expect(Project).to receive(:find_by_sql).with(expected_sql, any_args).and_call_original
+      expect(Project.find(project2.id)).to eq(project2)
     end
   end
 
-  # Versions earlier than 4.1 have a different behaviour regarding unsaved associations
-  if ActiveRecord::VERSION::MAJOR > 4 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 1)
-    describe 'with unsaved association' do
-      before do
-        @account = Account.create!(name: 'reflection tenant')
-        @manager = Manager.new(account: @account)
-        MultiTenant.current_tenant = @account
-        @account.update! name: 'reflection tenant update'
-      end
 
-      it 'persists the reflected association' do
-        expect(@manager.persisted?).to eq(true)
-      end
+  describe 'with unsaved association' do
+    before do
+      @account = Account.create!(name: 'reflection tenant')
+      @manager = Manager.new(account: @account)
+      MultiTenant.current_tenant = @account
+      @account.update! name: 'reflection tenant update'
+    end
+
+    it 'persists the reflected association' do
+      expect(@manager.persisted?).to eq(true)
     end
   end