activerecord-multi-tenant 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7125d7827e44ce5347a6391c97e740f74f1b20e0295ee1d88d80750c5d04c222
-  data.tar.gz: 5acb0ae83aef24141696b1683f759bed2ca7f5d8b6f9354b2ff9104f8c4d2f9c
+  metadata.gz: 457cfac4996b93bb7b0b25cd99c2687f2742a8bc580888008baa4f903255cd74
+  data.tar.gz: 8c369e04a906752deda52d9b7b78a2377551e4b85f74e3b6d4b0742d30147783
 SHA512:
-  metadata.gz: 761e37256c39851708bf4963a679e7d77f1f4f8c7d3a51d187bc5b6943d311caf75f9dbbd4ad5fd19a410940f245697c823c215edd38735599554b7685a1600d
-  data.tar.gz: 7e5063cd44d333a83afe565b713afc0af5d7e6aee2f849bd60afbb903e6aa11c4019e321019bccde91628051a558eca6e763f944b7dab327363949eabf76b27f
+  metadata.gz: 7715dadcbd9cd13d86135518d3fc62283d9ab85e802016ab1be15fe39d815ec344c1d3e4699f96870b6e50b6d3b66b4a38f780d07ad6d3d4b8e21668deacca18
+  data.tar.gz: d1d364ebde87012cc5b91a6cf812a1a8cc0f89bb5ee8859b3de01ab0392dc5a62b74a3f93ac721d3e583343b703fc872d73c1f301cff9716e686492f06922d36

data/.github/workflows/CI.yml

@@ -0,0 +1,73 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '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
+          - active_record_7.0
+        prepared_statements: [true, false]
+        exclude:
+          # activesupport-7.0.0 requires ruby version >= 2.7.0
+          - ruby: '2.5'
+            gemfile: 'rails_7.0'
+          - ruby: '2.5'
+            gemfile: 'active_record_7.0'
+          - ruby: '2.6'
+            gemfile: 'rails_7.0'
+          - ruby: '2.6'
+            gemfile: 'active_record_7.0'
+          # ruby >3 and activesupport 5.2 are not compatible
+          - ruby: '3.0'
+            gemfile: 'rails_5.2'
+          - ruby: '3.0'
+            gemfile: 'active_record_5.2'
+          - ruby: '3.1'
+            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
+       PREPARED_STATEMENTS: ${{ matrix.prepared_statements && '1' }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          docker-compose up -d
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: |
+          bundle exec rake spec

data/.gitignore

@@ -2,3 +2,5 @@ spec/debug.log
 pkg/
 *.rb#
 *.*~
+Gemfile.lock
+*.gemfile.lock

data/.rspec

@@ -0,0 +1 @@
+--force-color

data/Appraisals

@@ -14,6 +14,14 @@ appraise 'rails-6.0' do
   gem 'rails', '~> 6.0.3'
 end
 
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.1.0'
+end
+
+appraise 'rails-7.0' do
+  gem 'rails', '~> 7.0.0'
+end
+
 appraise 'active-record-5.2' do
   gem 'activerecord', '~> 5.2.0'
   gem 'i18n',  '~> 0.9.5'
@@ -29,3 +37,11 @@ end
 appraise 'active-record-6.0' do
   gem 'activerecord', '~> 6.0.3'
 end
+
+appraise 'active-record-6.1' do
+  gem 'activerecord', '~> 6.1.0'
+end
+
+appraise 'active-record-7.0' do
+  gem 'activerecord', '~> 7.0.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## 2.0.0      2022-05-19
+
+* Replace RequestStore with CurrentAttributes [#139](https://github.com/citusdata/activerecord-multi-tenant/pull/139)
+* Support changing table_name after calling multi_tenant [#128](https://github.com/citusdata/activerecord-multi-tenant/pull/128)
+* Allow to use uuid as primary key on partition table [#112](https://github.com/citusdata/activerecord-multi-tenant/pull/112)
+* Support latest Rails 5.2 [#145](https://github.com/citusdata/activerecord-multi-tenant/pull/145)
+* Support optional: true for belongs_to [#147](https://github.com/citusdata/activerecord-multi-tenant/pull/147)
+
+
+## 1.2.0      2022-03-29
+
+* Test Rails 7 & Ruby 3
+* Fix regression in 1.1.1 involving deleted tenants [#123](https://github.com/citusdata/activerecord-multi-tenant/pull/123)
+* Fix incorrect SQL generated when joining two models and one has a default scope [#132](https://github.com/citusdata/activerecord-multi-tenant/pull/132)
+* Update for Rails 5+ removal of type_cast_for_database [#135](https://github.com/citusdata/activerecord-multi-tenant/pull/135)
+
+
+## 1.1.1      2021-01-15
+
+* Add support for Rails 6.1 [#108](https://github.com/citusdata/activerecord-multi-tenant/pull/108)
+* Fix statement cache for has_many through relations [#103](https://github.com/citusdata/activerecord-multi-tenant/pull/103)
+
+
+## 1.1.0      2020-08-06
+
+* See commits for changes:
+  https://github.com/citusdata/activerecord-multi-tenant/commits/v1.1.0
+
 
 ## 1.0.4      2019-10-30
 

data/activerecord-multi-tenant.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/citusdata/activerecord-multi-tenant'
   s.license       = 'MIT'
 
-  s.add_runtime_dependency('request_store', '>= 1.0.5')
-  s.add_dependency('rails','>= 4.2')
+  s.add_dependency 'rails', '>= 5.2'
 
   s.add_development_dependency 'rspec', '>= 3.0'
   s.add_development_dependency 'rspec-rails'

data/gemfiles/active_record_5.2.3.gemfile

@@ -0,0 +1,16 @@
+# 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/active_record_6.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/active_record_7.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "~> 7.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_5.2.3.gemfile

@@ -0,0 +1,16 @@
+# 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: "../"

data/gemfiles/rails_6.1.gemfile

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

data/gemfiles/rails_7.0.gemfile

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

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

@@ -0,0 +1,200 @@
+module MultiTenant
+  class ArelVisitorsDepthFirst < Arel::Visitors::Visitor
+    def initialize(block = nil)
+      @block = block || Proc.new
+      super()
+    end
+
+    private
+
+      def visit(o, _ = nil)
+        super
+        @block.call o
+      end
+
+      def unary(o)
+        visit o.expr
+      end
+      alias :visit_Arel_Nodes_Else              :unary
+      alias :visit_Arel_Nodes_Group             :unary
+      alias :visit_Arel_Nodes_Cube              :unary
+      alias :visit_Arel_Nodes_RollUp            :unary
+      alias :visit_Arel_Nodes_GroupingSet       :unary
+      alias :visit_Arel_Nodes_GroupingElement   :unary
+      alias :visit_Arel_Nodes_Grouping          :unary
+      alias :visit_Arel_Nodes_Having            :unary
+      alias :visit_Arel_Nodes_Lateral           :unary
+      alias :visit_Arel_Nodes_Limit             :unary
+      alias :visit_Arel_Nodes_Not               :unary
+      alias :visit_Arel_Nodes_Offset            :unary
+      alias :visit_Arel_Nodes_On                :unary
+      alias :visit_Arel_Nodes_Ordering          :unary
+      alias :visit_Arel_Nodes_Ascending         :unary
+      alias :visit_Arel_Nodes_Descending        :unary
+      alias :visit_Arel_Nodes_UnqualifiedColumn :unary
+      alias :visit_Arel_Nodes_OptimizerHints    :unary
+      alias :visit_Arel_Nodes_ValuesList        :unary
+
+      def function(o)
+        visit o.expressions
+        visit o.alias
+        visit o.distinct
+      end
+      alias :visit_Arel_Nodes_Avg    :function
+      alias :visit_Arel_Nodes_Exists :function
+      alias :visit_Arel_Nodes_Max    :function
+      alias :visit_Arel_Nodes_Min    :function
+      alias :visit_Arel_Nodes_Sum    :function
+
+      def visit_Arel_Nodes_NamedFunction(o)
+        visit o.name
+        visit o.expressions
+        visit o.distinct
+        visit o.alias
+      end
+
+      def visit_Arel_Nodes_Count(o)
+        visit o.expressions
+        visit o.alias
+        visit o.distinct
+      end
+
+      def visit_Arel_Nodes_Case(o)
+        visit o.case
+        visit o.conditions
+        visit o.default
+      end
+
+      def nary(o)
+        o.children.each { |child| visit child }
+      end
+      alias :visit_Arel_Nodes_And :nary
+
+      def binary(o)
+        visit o.left
+        visit o.right
+      end
+      alias :visit_Arel_Nodes_As                 :binary
+      alias :visit_Arel_Nodes_Assignment         :binary
+      alias :visit_Arel_Nodes_Between            :binary
+      alias :visit_Arel_Nodes_Concat             :binary
+      alias :visit_Arel_Nodes_DeleteStatement    :binary
+      alias :visit_Arel_Nodes_DoesNotMatch       :binary
+      alias :visit_Arel_Nodes_Equality           :binary
+      alias :visit_Arel_Nodes_FullOuterJoin      :binary
+      alias :visit_Arel_Nodes_GreaterThan        :binary
+      alias :visit_Arel_Nodes_GreaterThanOrEqual :binary
+      alias :visit_Arel_Nodes_In                 :binary
+      alias :visit_Arel_Nodes_InfixOperation     :binary
+      alias :visit_Arel_Nodes_JoinSource         :binary
+      alias :visit_Arel_Nodes_InnerJoin          :binary
+      alias :visit_Arel_Nodes_LessThan           :binary
+      alias :visit_Arel_Nodes_LessThanOrEqual    :binary
+      alias :visit_Arel_Nodes_Matches            :binary
+      alias :visit_Arel_Nodes_NotEqual           :binary
+      alias :visit_Arel_Nodes_NotIn              :binary
+      alias :visit_Arel_Nodes_NotRegexp          :binary
+      alias :visit_Arel_Nodes_IsNotDistinctFrom  :binary
+      alias :visit_Arel_Nodes_IsDistinctFrom     :binary
+      alias :visit_Arel_Nodes_Or                 :binary
+      alias :visit_Arel_Nodes_OuterJoin          :binary
+      alias :visit_Arel_Nodes_Regexp             :binary
+      alias :visit_Arel_Nodes_RightOuterJoin     :binary
+      alias :visit_Arel_Nodes_TableAlias         :binary
+      alias :visit_Arel_Nodes_When               :binary
+
+      def visit_Arel_Nodes_StringJoin(o)
+        visit o.left
+      end
+
+      def visit_Arel_Attribute(o)
+        visit o.relation
+        visit o.name
+      end
+      alias :visit_Arel_Attributes_Integer :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_Float :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_String :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_Time :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_Boolean :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_Attribute :visit_Arel_Attribute
+      alias :visit_Arel_Attributes_Decimal :visit_Arel_Attribute
+
+      def visit_Arel_Table(o)
+        visit o.name
+      end
+
+      def terminal(o)
+      end
+      alias :visit_ActiveSupport_Multibyte_Chars :terminal
+      alias :visit_ActiveSupport_StringInquirer  :terminal
+      alias :visit_Arel_Nodes_Lock               :terminal
+      alias :visit_Arel_Nodes_Node               :terminal
+      alias :visit_Arel_Nodes_SqlLiteral         :terminal
+      alias :visit_Arel_Nodes_BindParam          :terminal
+      alias :visit_Arel_Nodes_Window             :terminal
+      alias :visit_Arel_Nodes_True               :terminal
+      alias :visit_Arel_Nodes_False              :terminal
+      alias :visit_BigDecimal                    :terminal
+      alias :visit_Class                         :terminal
+      alias :visit_Date                          :terminal
+      alias :visit_DateTime                      :terminal
+      alias :visit_FalseClass                    :terminal
+      alias :visit_Float                         :terminal
+      alias :visit_Integer                       :terminal
+      alias :visit_NilClass                      :terminal
+      alias :visit_String                        :terminal
+      alias :visit_Symbol                        :terminal
+      alias :visit_Time                          :terminal
+      alias :visit_TrueClass                     :terminal
+
+      def visit_Arel_Nodes_InsertStatement(o)
+        visit o.relation
+        visit o.columns
+        visit o.values
+      end
+
+      def visit_Arel_Nodes_SelectCore(o)
+        visit o.projections
+        visit o.source
+        visit o.wheres
+        visit o.groups
+        visit o.windows
+        visit o.havings
+      end
+
+      def visit_Arel_Nodes_SelectStatement(o)
+        visit o.cores
+        visit o.orders
+        visit o.limit
+        visit o.lock
+        visit o.offset
+      end
+
+      def visit_Arel_Nodes_UpdateStatement(o)
+        visit o.relation
+        visit o.values
+        visit o.wheres
+        visit o.orders
+        visit o.limit
+      end
+
+      def visit_Arel_Nodes_Comment(o)
+        visit o.values
+      end
+
+      def visit_Array(o)
+        o.each { |i| visit i }
+      end
+      alias :visit_Set :visit_Array
+
+      def visit_Hash(o)
+        o.each { |k, v| visit(k); visit(v) }
+      end
+
+      DISPATCH = dispatch_cache
+
+      def get_dispatch_cache
+        DISPATCH
+      end
+  end
+end

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

@@ -9,7 +9,7 @@ module MultiTenant
     end
 
     def <<(row)
-      row = row.map.with_index { |val, idx| @column_types[idx].type_cast_for_database(val) }
+      row = row.map.with_index { |val, idx| @column_types[idx].serialize(val) }
       @conn.put_copy_data(row)
       @count += 1
     end
@@ -18,7 +18,7 @@ module MultiTenant
   module CopyFromClient
     def copy_from_client(columns, &block)
       conn         = connection.raw_connection
-      column_types = columns.map { |c| columns_hash[c.to_s] }
+      column_types = columns.map { |c| type_for_attribute(c.to_s) }
       helper = MultiTenant::CopyFromClientHelper.new(conn, column_types)
       conn.copy_data %{COPY #{quoted_table_name}("#{columns.join('","')}") FROM STDIN}, PG::TextEncoder::CopyRow.new do
         block.call helper

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

@@ -6,7 +6,13 @@ module MultiTenant
       if to_s.underscore.to_sym == tenant_name
         unless MultiTenant.with_write_only_mode_enabled?
           # This is the tenant model itself. Workaround for https://github.com/citusdata/citus/issues/687
-          before_create -> { self.id ||= self.class.connection.select_value("SELECT nextval('" + [self.class.table_name, self.class.primary_key, 'seq'].join('_') + "'::regclass)") }
+          before_create -> do
+           if self.class.columns_hash[self.class.primary_key].type == :uuid
+             self.id ||= SecureRandom.uuid
+           else
+             self.id ||= self.class.connection.select_value("SELECT nextval('#{self.class.table_name}_#{self.class.primary_key}_seq'::regclass)")
+           end
+          end
         end
       else
         class << self
@@ -38,18 +44,18 @@ module MultiTenant
 
           def inherited(subclass)
             super
-            MultiTenant.register_multi_tenant_model(subclass.table_name, subclass) if subclass.table_name
+            MultiTenant.register_multi_tenant_model(subclass)
           end
         end
 
-        MultiTenant.register_multi_tenant_model(table_name, self) if table_name
+        MultiTenant.register_multi_tenant_model(self)
 
         @partition_key = options[:partition_key] || MultiTenant.partition_key(tenant_name)
         partition_key = @partition_key
 
         # Create an implicit belongs_to association only if tenant class exists
         if MultiTenant.tenant_klass_defined?(tenant_name)
-          belongs_to tenant_name, **options.slice(:class_name, :inverse_of).merge(foreign_key: options[:partition_key])
+          belongs_to tenant_name, **options.slice(:class_name, :inverse_of, :optional).merge(foreign_key: options[:partition_key])
         end
 
         # New instances should have the tenant set
@@ -129,6 +135,12 @@ 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?
+
+    if reflection.through_reflection
+      through_klass = reflection.through_reflection.klass
+      return true if through_klass.respond_to?(:scoped_by_tenant?) && through_klass.scoped_by_tenant?
+    end
+
     skip_statement_cache_orig(*scope)
   end
 end

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

@@ -1,6 +1,10 @@
-require 'request_store'
+require 'active_support/current_attributes'
 
 module MultiTenant
+  class Current < ::ActiveSupport::CurrentAttributes
+    attribute :tenant
+  end
+
   def self.tenant_klass_defined?(tenant_name)
     !!tenant_name.to_s.classify.safe_constantize
   end
@@ -24,13 +28,23 @@ module MultiTenant
   def self.with_lock_workaround_enabled?; @@enable_with_lock_workaround; end
 
   # Registry that maps table names to models (used by the query rewriter)
-  def self.register_multi_tenant_model(table_name, model_klass)
-    @@multi_tenant_models ||= {}
-    @@multi_tenant_models[table_name.to_s] = model_klass
+  def self.register_multi_tenant_model(model_klass)
+    @@multi_tenant_models ||= []
+    @@multi_tenant_models.push(model_klass)
+
+    remove_class_variable(:@@multi_tenant_model_table_names) if defined?(@@multi_tenant_model_table_names)
   end
+
   def self.multi_tenant_model_for_table(table_name)
-    @@multi_tenant_models ||= {}
-    @@multi_tenant_models[table_name.to_s]
+    @@multi_tenant_models ||= []
+
+    if !defined?(@@multi_tenant_model_table_names)
+      @@multi_tenant_model_table_names = @@multi_tenant_models.map { |model|
+        [model.table_name, model] if model.table_name
+      }.compact.to_h
+    end
+
+    @@multi_tenant_model_table_names[table_name.to_s]
   end
 
   def self.multi_tenant_model_for_arel(arel)
@@ -43,11 +57,11 @@ module MultiTenant
   end
 
   def self.current_tenant=(tenant)
-    RequestStore.store[:current_tenant] = tenant
+    Current.tenant = tenant
   end
 
   def self.current_tenant
-    RequestStore.store[:current_tenant]
+    Current.tenant
   end
 
   def self.current_tenant_id

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)
@@ -272,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"
@@ -287,12 +295,9 @@ module ActiveRecord
               end
 
               node_list.select{ |n| n.is_a? Arel::Nodes::Join }.each do |node_join|
-                if (!node_join.right ||
-                    (ActiveRecord::VERSION::MAJOR == 5 &&
-                     !node_join.right.expr.right.is_a?(Arel::Attributes::Attribute)))
+                if !node_join.right
                   next
                 end
-
                 relation_right, relation_left = relations_from_node_join(node_join)
 
                 next unless relation_right && relation_left
@@ -314,13 +319,13 @@ 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 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
+      children = [node_join.right.expr.children].flatten
 
-      tenant_applied = children.any?(MultiTenant::TenantEnforcementClause) || children.any?(MultiTenant::TenantJoinEnforcementClause)
+      tenant_applied = children.any?{|c| c.is_a?(MultiTenant::TenantEnforcementClause) || c.is_a?(MultiTenant::TenantJoinEnforcementClause)}
       if tenant_applied || children.empty?
         return nil, nil
       end

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

@@ -18,7 +18,11 @@ module Sidekiq::Middleware::MultiTenant
   class Server
     def call(worker_class, msg, queue)
       if msg.has_key?('multi_tenant')
-        tenant = msg['multi_tenant']['class'].constantize.find(msg['multi_tenant']['id'])
+        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

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

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end