activerecord-multi-tenant 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ad5f8df62dcf4cb4308e7b52736ba20212cc154
-  data.tar.gz: 244c9cdcd00b6d62a982a9dfa6917dade6aacf60
+  metadata.gz: 37f0a1949a56f1bf5bbf3c5e4e00f0e5afdc87f8
+  data.tar.gz: bcf4da0d8b2228a3cac88ca747286beabfb543c8
 SHA512:
-  metadata.gz: d2cde81a900904e331d3f4558b5ebfbb55547bebef5ec841087081a23598bcc89bbbd7d077fab260cc70a0fb5b0aa8ab535d4b89040cb4f784b6299e2d27231c
-  data.tar.gz: 406344742c98800907c67436dc7d711e85a11d73d78b262504586de9c0a943cef854181493f6985dac3a0dcf5feb902ddff00b0ea0f323edfb5446d846483bad
+  metadata.gz: 54f89ab0a2b8b648a55be5de6e31fbf7acbafb125f530348bc30b0e1ddde48444a0be30aa60c54ee17e075fbc0f868aae45b94277daf977e1d0160385fe1d426
+  data.tar.gz: 60483177cedff455c9faafdfe6f3370cfd09ab90bbb5c5ed10a1c4b71c606c425f325611c063f77441d0647b66093fc30661b8bba7ee346121acb98bd8a18fab

data/.travis.yml

@@ -4,12 +4,11 @@ cache: bundler
 language: ruby
 
 rvm:
-  - 2.1
-  - 2.3.3
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 
 gemfile:
-  - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
@@ -20,17 +19,9 @@ gemfile:
 matrix:
   fast_finish: true
   exclude:
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/active_record_5.1.gemfile
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       gemfile: gemfiles/rails_4.1.gemfile
 
 services:

data/Appraisals

@@ -1,8 +1,3 @@
-appraise 'rails-3.2' do
-  gem 'test-unit', '~> 3.0'
-  gem 'rails', '3.2.22.5'
-end
-
 appraise 'rails-4.0' do
   gem 'rails', '4.0.13'
 end

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.8.0       2017-08-16
+
+* Significant improvements and simplifications of query rewriting
+  * Big thanks to [Kyle Bock](https://github.com/kwbock) and [Ben Olive](https://github.com/sionide21)
+    for (re-)writing this code and verifying it works well
+  * This fixes caching issues across multiple MultiTenant.with { } blocks when
+    interacting with the Rails statement cache
+* Drop support for Rails 3.2
+  * The arel version used in Rails 3.2 has caused more trouble than its worth -
+    it seems less troublesome to ask any users of this library to upgrade to at
+    least Rails 4.0
+
+
 ## 0.7.0       2017-07-18
 
 * Switch back to Relation-based mechanism of hooking into ActiveRecord (this resolves issues for simple queries that didn't get rewritten)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-multi-tenant (0.7.0)
+    activerecord-multi-tenant (0.8.0)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 
@@ -51,6 +51,8 @@ GEM
       thor (>= 0.14.0)
     arel (7.1.4)
     builder (3.2.2)
+    byebug (9.0.6)
+    coderay (1.1.1)
     concurrent-ruby (1.0.4)
     connection_pool (2.2.1)
     diff-lcs (1.2.5)
@@ -60,7 +62,7 @@ GEM
     i18n (0.7.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.5)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
@@ -72,6 +74,13 @@ GEM
     nokogiri (1.7.0)
       mini_portile2 (~> 2.1.0)
     pg (0.19.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     rack (2.0.1)
     rack-protection (1.5.3)
       rack
@@ -129,6 +138,7 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
+    slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -151,6 +161,8 @@ DEPENDENCIES
   activerecord-multi-tenant!
   appraisal
   pg
+  pry
+  pry-byebug
   rake
   rspec (>= 3.0)
   rspec-rails
@@ -158,4 +170,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/README.md

@@ -16,7 +16,7 @@ gem 'activerecord-multi-tenant'
 
 ## Supported Rails versions
 
-All Ruby on Rails versions starting with 3.2 or newer are supported.
+All Ruby on Rails versions starting with 4.0 or newer are supported.
 
 This gem only supports ActiveRecord (the Rails default ORM), and not alternative ORMs like Sequel.
 
@@ -101,4 +101,4 @@ This gem was initially based on [acts_as_tenant](https://github.com/ErwinM/acts_
 ## License
 
 Licensed under the MIT license<br>
-Copyright (c) 2016, Citus Data Inc.
+Copyright (c) 2017, Citus Data Inc.

data/activerecord-multi-tenant.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sidekiq'
   s.add_development_dependency 'thor'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-byebug'
 end

data/gemfiles/active_record_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.7.0)
+    activerecord-multi-tenant (0.8.0)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 
@@ -51,6 +51,8 @@ GEM
       thor (>= 0.14.0)
     arel (8.0.0)
     builder (3.2.3)
+    byebug (9.0.6)
+    coderay (1.1.1)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     diff-lcs (1.3)
@@ -60,7 +62,7 @@ GEM
     i18n (0.8.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.5)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
@@ -68,10 +70,17 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    nio4r (2.0.0)
+    nio4r (2.1.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     pg (0.20.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     rack (2.0.1)
     rack-protection (1.5.3)
       rack
@@ -129,6 +138,7 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
+    slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -152,6 +162,8 @@ DEPENDENCIES
   activerecord-multi-tenant!
   appraisal
   pg
+  pry
+  pry-byebug
   rake
   rspec (>= 3.0)
   rspec-rails
@@ -159,4 +171,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/gemfiles/rails_4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.7.0)
+    activerecord-multi-tenant (0.8.0)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 
@@ -38,6 +38,8 @@ GEM
       thor (>= 0.14.0)
     arel (4.0.2)
     builder (3.1.4)
+    byebug (9.0.6)
+    coderay (1.1.1)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     diff-lcs (1.3)
@@ -45,12 +47,20 @@ GEM
     i18n (0.8.1)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     minitest (4.7.5)
     multi_json (1.12.1)
     pg (0.20.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     rack (1.5.5)
     rack-protection (2.0.0)
       rack
@@ -98,6 +108,7 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.3, >= 3.3.3)
+    slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -116,6 +127,8 @@ DEPENDENCIES
   activerecord-multi-tenant!
   appraisal
   pg
+  pry
+  pry-byebug
   rails (= 4.0.13)
   rake
   rspec (>= 3.0)
@@ -124,4 +137,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/gemfiles/rails_4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.7.0)
+    activerecord-multi-tenant (0.8.0)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 
@@ -40,6 +40,8 @@ GEM
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
     builder (3.2.3)
+    byebug (9.0.6)
+    coderay (1.1.1)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     diff-lcs (1.3)
@@ -48,11 +50,19 @@ GEM
     json (1.8.6)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     minitest (5.10.1)
     pg (0.20.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     rack (1.5.5)
     rack-protection (2.0.0)
       rack
@@ -102,6 +112,7 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.3, >= 3.3.3)
+    slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -121,6 +132,8 @@ DEPENDENCIES
   activerecord-multi-tenant!
   appraisal
   pg
+  pry
+  pry-byebug
   rails (= 4.1.16)
   rake
   rspec (>= 3.0)
@@ -129,4 +142,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.7.0)
+    activerecord-multi-tenant (0.8.0)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 
@@ -48,6 +48,8 @@ GEM
       thor (>= 0.14.0)
     arel (6.0.4)
     builder (3.2.3)
+    byebug (9.0.6)
+    coderay (1.1.1)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     diff-lcs (1.3)
@@ -59,6 +61,7 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
@@ -67,6 +70,13 @@ GEM
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     pg (0.20.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     rack (1.6.5)
     rack-protection (1.5.3)
       rack
@@ -125,6 +135,7 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
+    slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -144,6 +155,8 @@ DEPENDENCIES
   activerecord-multi-tenant!
   appraisal
   pg
+  pry
+  pry-byebug
   rails (= 4.2.8)
   rake
   rspec (>= 3.0)
@@ -152,4 +165,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.7.0)
+    activerecord-multi-tenant (0.8.0)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 
@@ -51,6 +51,8 @@ GEM
       thor (>= 0.14.0)
     arel (7.1.4)
     builder (3.2.3)
+    byebug (9.0.6)
+    coderay (1.1.1)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     diff-lcs (1.3)
@@ -72,6 +74,13 @@ GEM
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     pg (0.20.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     rack (2.0.1)
     rack-protection (1.5.3)
       rack
@@ -129,6 +138,7 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
+    slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -151,6 +161,8 @@ DEPENDENCIES
   activerecord-multi-tenant!
   appraisal
   pg
+  pry
+  pry-byebug
   rails (= 5.0.1)
   rake
   rspec (>= 3.0)
@@ -159,4 +171,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.7.0)
+    activerecord-multi-tenant (0.8.0)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 
@@ -51,6 +51,8 @@ GEM
       thor (>= 0.14.0)
     arel (8.0.0)
     builder (3.2.3)
+    byebug (9.0.6)
+    coderay (1.1.1)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     diff-lcs (1.3)
@@ -72,6 +74,13 @@ GEM
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     pg (0.20.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     rack (2.0.1)
     rack-protection (1.5.3)
       rack
@@ -129,6 +138,7 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
+    slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -151,6 +161,8 @@ DEPENDENCIES
   activerecord-multi-tenant!
   appraisal
   pg
+  pry
+  pry-byebug
   rails (= 5.1.0)
   rake
   rspec (>= 3.0)
@@ -159,4 +171,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

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

@@ -15,4 +15,4 @@ module MultiTenant
   end
 end
 
-ActiveSupport::Notifications.subscribe('sql.active_record', MultiTenant::QueryMonitor.new) if ActiveRecord::VERSION::MAJOR >= 4
+ActiveSupport::Notifications.subscribe('sql.active_record', MultiTenant::QueryMonitor.new)

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

@@ -1,60 +1,117 @@
 require 'active_record'
 
 module MultiTenant
+  class Table
+    attr_reader :arel_table
+
+    def initialize(arel_table)
+      @arel_table = arel_table
+    end
+
+    def eql?(rhs)
+      self.class == rhs.class &&
+        equality_fields.eql?(rhs.equality_fields)
+    end
+
+    def hash
+      equality_fields.hash
+    end
+
+    protected
+
+    def equality_fields
+      [arel_table.name, arel_table.table_alias]
+    end
+  end
+
+  class Context
+    attr_reader :arel_node, :known_relations, :handled_relations
+
+    def initialize(arel_node)
+      @arel_node = arel_node
+      @known_relations = []
+      @handled_relations = []
+    end
+
+    def discover_relations
+      old_discovering = @discovering
+      @discovering = true
+      yield
+      @discovering = old_discovering
+    end
+
+    def visited_relation(relation)
+      return unless @discovering
+      @known_relations << Table.new(relation)
+    end
+
+    def visited_handled_relation(relation)
+      @handled_relations << Table.new(relation)
+    end
+
+    def unhandled_relations
+      known_relations.uniq - handled_relations
+    end
+  end
+
   class ArelTenantVisitor < Arel::Visitors::DepthFirst
     def initialize(arel)
       super(Proc.new {})
-      @tenant_relations = {}
-      @existing_tenant_relations = {}
-      @outer_joins_by_table_name = {}
       @statement_node_id = nil
 
+      @contexts = []
+      @current_context = nil
       accept(arel.ast)
     end
 
-    def tenant_relations
-      @tenant_relations
+    attr_reader :contexts
+
+    def visit_Arel_Attributes_Attribute(*args)
+      return if @current_context.nil?
+      super(*args)
     end
 
-    def existing_tenant_relations
-      @existing_tenant_relations
+    def visit_Arel_Nodes_Equality(o, *args)
+      if o.left.is_a?(Arel::Attributes::Attribute)
+        table_name = o.left.relation.table_name
+        model = MultiTenant.multi_tenant_model_for_table(table_name)
+        @current_context.visited_handled_relation(o.left.relation) if model.present? && o.left.name == model.partition_key
+      end
+      super(o, *args)
     end
 
-    def outer_joins_by_table_name
-      @outer_joins_by_table_name
+    def visit_MultiTenant_TenantEnforcementClause(o, *)
+      @current_context.visited_handled_relation(o.tenant_attribute.relation)
     end
 
     def visit_Arel_Table(o, _collector = nil)
-      @tenant_relations[@statement_node_id] ||= []
-      @tenant_relations[@statement_node_id] << o if tenant_relation?(o.table_name)
+      @current_context.visited_relation(o) if tenant_relation?(o.table_name)
     end
     alias :visit_Arel_Nodes_TableAlias :visit_Arel_Table
 
-    def visit_Arel_Nodes_SelectStatement(o, _collector = nil)
-      @statement_node_id = o.object_id
-      visit o.cores
-      visit o.orders
-      visit o.limit
-      visit o.lock
-      visit o.offset
-    end
-
-    def visit_Arel_Nodes_Equality(o, _collector = nil)
-      if o.left.is_a?(Arel::Attributes::Attribute)
-        table_name = o.left.relation.table_name
-        model = MultiTenant.multi_tenant_model_for_table(table_name)
-        @existing_tenant_relations[@statement_node_id] ||= []
-        @existing_tenant_relations[@statement_node_id] << o.left.relation if model.present? && o.left.name == model.partition_key
+    def visit_Arel_Nodes_SelectCore(o, *args)
+      nest_context(o) do
+        @current_context.discover_relations do
+          visit o.source
+        end
+        visit o.wheres
+        visit o.groups
+        visit o.windows
+        if defined?(o.having)
+          visit o.having
+        else
+          visit o.havings
+        end
       end
     end
 
     def visit_Arel_Nodes_OuterJoin(o, collector = nil)
-      if o.left.is_a?(Arel::Nodes::TableAlias) || o.left.is_a?(Arel::Table)
-        @outer_joins_by_table_name[@statement_node_id] ||= {}
-        @outer_joins_by_table_name[@statement_node_id][o.left.name] = o
+      nest_context(o) do
+        @current_context.discover_relations do
+          visit o.left
+          visit o.right
+        end
       end
-      visit o.left
-      visit o.right
     end
     alias :visit_Arel_Nodes_FullOuterJoin :visit_Arel_Nodes_OuterJoin
     alias :visit_Arel_Nodes_RightOuterJoin :visit_Arel_Nodes_OuterJoin
@@ -64,9 +121,73 @@ module MultiTenant
     def tenant_relation?(table_name)
       MultiTenant.multi_tenant_model_for_table(table_name).present?
     end
+
+    DISPATCH = Hash.new do |hash, klass|
+      hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"
+    end
+
+    def dispatch
+      DISPATCH
+    end
+
+    def get_dispatch_cache
+      dispatch
+    end
+
+    def nest_context(o)
+      old_context = @current_context
+      @current_context = Context.new(o)
+      @contexts << @current_context
+
+      yield
+
+      @current_context = old_context
+    end
+  end
+
+  class TenantEnforcementClause < Arel::Nodes::Node
+    attr_reader :tenant_attribute
+    def initialize(tenant_attribute)
+      @tenant_attribute = tenant_attribute
+    end
+
+    def to_s; to_sql; end
+    def to_str; to_sql; end
+
+    def to_sql(*)
+      if MultiTenant.current_tenant_id
+        tenant_arel.to_sql
+      else
+        '1=1'
+      end
+    end
+
+    private
+
+    def tenant_arel
+      if defined?(Arel::Nodes::Quoted)
+        @tenant_attribute.eq(Arel::Nodes::Quoted.new(MultiTenant.current_tenant_id))
+      else
+        @tenant_attribute.eq(MultiTenant.current_tenant_id)
+      end
+    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
+    else
+      def visit_MultiTenant_TenantEnforcementClause(o, a = nil)
+        o
+      end
+    end
   end
 end
 
+Arel::Visitors::ToSql.include(MultiTenant::TenantValueVisitor)
+
 require 'active_record/relation'
 module ActiveRecord
   module QueryMethods
@@ -76,36 +197,23 @@ module ActiveRecord
 
       if MultiTenant.current_tenant_id && !MultiTenant.with_write_only_mode_enabled?
         visitor = MultiTenant::ArelTenantVisitor.new(arel)
-        visitor.tenant_relations.each do |statement_node_id, relations|
-          # Process every level of the statement separately, so we don't mix subselects
-          known_relations = visitor.existing_tenant_relations[statement_node_id] || []
-          outer_joins_by_table_name = visitor.outer_joins_by_table_name[statement_node_id] || {}
-
-          relations.each do |relation|
-            model = MultiTenant.multi_tenant_model_for_table(relation.table_name)
-            next unless model.present?
-            next if known_relations.map(&:name).include?(relation.name)
-
-            tenant_relation = known_relations.reject { |r| outer_joins_by_table_name.key?(r.name) }.first
-            tenant_value = if tenant_relation.present?
-                             known_model = MultiTenant.multi_tenant_model_for_table(tenant_relation.table_name)
-                             tenant_relation[known_model.partition_key]
-                           else
-                             MultiTenant.current_tenant_id
-                           end
-
-            known_relations << relation
-
-            outer_join = outer_joins_by_table_name[relation.name]
-            if outer_join
-              outer_join.right.expr = Arel::Nodes::And.new([outer_join.right.expr, relation[model.partition_key].eq(tenant_value)])
-            else
-              ctx = arel.ast.cores.last
-              if ctx.wheres.size == 1
-                ctx.wheres = [Arel::Nodes::And.new([ctx.wheres.first, relation[model.partition_key].eq(tenant_value)])]
+        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]
               else
-                arel = arel.where(relation[model.partition_key].eq(tenant_value))
+                node.wheres[0] = enforcement_clause.and(node.wheres[0])
               end
+            else
+              raise "UnknownContext"
             end
           end
         end

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

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

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

@@ -9,11 +9,7 @@ describe "Controller Extensions", type: :controller do
     include Rails.application.routes.url_helpers
     set_current_tenant_through_filter
 
-    if ActionPack::VERSION::MAJOR < 4
-      before_filter :your_method_that_finds_the_current_tenant
-    else
-      before_action :your_method_that_finds_the_current_tenant
-    end
+    before_action :your_method_that_finds_the_current_tenant
 
     def your_method_that_finds_the_current_tenant
       current_account = Account.new

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

@@ -287,8 +287,71 @@ describe MultiTenant do
     end
   end
 
-  if ActiveRecord::VERSION::MAJOR > 4 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR > 0)
-    # Reflection
+  it 'does not cache tenancy in associations' do
+    account1 = Account.create! name: 'test1'
+    account2 = Account.create! name: 'test2'
+
+    MultiTenant.with(account1) do
+      project1 = Project.create! name: 'something1'
+      task1 = Task.create! name: 'task1', project: project1
+      subtask1 = SubTask.create! task: task1
+
+      expect(subtask1.project).to be_present
+    end
+
+    MultiTenant.with(account2) do
+      project2 = Project.create! name: 'something2'
+      task2 = Task.create! name: 'task2', project: project2
+      subtask2 = SubTask.create! task: task2
+
+      expect(subtask2.project).to be_present
+    end
+  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" WHERE "tasks"."account_id" = 1 AND "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = 1
+    sql
+    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
+  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)
+    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 = <<-sql.strip
+        SELECT  "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = #{project.id} LIMIT 1
+        sql
+        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.with(nil) do
+        expected_sql = <<-sql.strip
+        SELECT  "projects".* FROM "projects" WHERE 1=1 AND "projects"."id" = #{project2.id} LIMIT 1
+        sql
+        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
+  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')

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

@@ -8,4 +8,12 @@ describe MultiTenant, 'Record finding' do
       expect(Project.find(project.id)).to be_present
     end
   end
+
+  it 'supports UUIDs' do
+    organization = Organization.create! name: 'test'
+    uuid_record = organization.uuid_records.create! description: 'something'
+    MultiTenant.with(organization) do
+      expect(UuidRecord.find(uuid_record.id)).to be_present
+    end
+  end
 end

data/spec/schema.rb

@@ -1,5 +1,8 @@
 # Resets the database, except when we are only running a specific spec
 ARGV.grep(/\w+_spec\.rb/).empty? && ActiveRecord::Schema.define(version: 1) do
+  enable_extension_on_all_nodes 'uuid-ossp'
+  enable_extension_on_all_nodes 'pgcrypto'
+
   create_table :accounts, force: true do |t|
     t.column :name, :string
     t.column :subdomain, :string
@@ -66,6 +69,15 @@ ARGV.grep(/\w+_spec\.rb/).empty? && ActiveRecord::Schema.define(version: 1) do
     t.column :name, :string
   end
 
+  create_table :organizations, force: true, id: :uuid do |t|
+    t.column :name, :string
+  end
+
+  create_table :uuid_records, force: true, partition_key: :organization_id do |t|
+    t.column :organization_id, :uuid
+    t.column :description, :string
+  end
+
   create_distributed_table :accounts, :id
   create_distributed_table :projects, :account_id
   create_distributed_table :managers, :account_id
@@ -76,6 +88,7 @@ ARGV.grep(/\w+_spec\.rb/).empty? && ActiveRecord::Schema.define(version: 1) do
   create_distributed_table :comments, :account_id
   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
 end
 
 class Account < ActiveRecord::Base
@@ -90,11 +103,7 @@ class Project < ActiveRecord::Base
   has_many :tasks
   has_many :sub_tasks, through: :tasks
 
-  if ActiveRecord::VERSION::MAJOR < 4
-    validates_uniqueness_of :name, scope: [:account_id]
-  else
-    validates_uniqueness_of :name, scope: [:account]
-  end
+  validates_uniqueness_of :name, scope: [:account]
 end
 
 class Manager < ActiveRecord::Base
@@ -107,8 +116,6 @@ class Task < ActiveRecord::Base
   belongs_to :project
   has_many :sub_tasks
 
-  default_scope -> { where(completed: nil).order('name') }
-
   validates_uniqueness_of :name
 end
 
@@ -133,11 +140,7 @@ end
 class CustomPartitionKeyTask < ActiveRecord::Base
   multi_tenant :account, partition_key: 'accountID'
 
-  if ActiveRecord::VERSION::MAJOR < 4
-    validates_uniqueness_of :name, scope: [:accountID]
-  else
-    validates_uniqueness_of :name, scope: [:account]
-  end
+  validates_uniqueness_of :name, scope: [:account]
 end
 
 class PartitionKeyNotModelTask < ActiveRecord::Base
@@ -160,3 +163,11 @@ class Comment < ActiveRecord::Base
     belongs_to :task, -> { where(comments: { commentable_type: 'Task'  }) }, foreign_key: 'commentable_id'
   end
 end
+
+class Organization < ActiveRecord::Base
+  has_many :uuid_records
+end
+
+class UuidRecord < ActiveRecord::Base
+  multi_tenant :organization
+end

data/spec/spec_helper.rb

@@ -7,6 +7,9 @@ require 'rspec/rails'
 
 require 'activerecord-multi-tenant'
 
+require 'bundler'
+Bundler.require(:default, :development)
+
 dbconfig = YAML::load(IO.read(File.join(File.dirname(__FILE__), 'database.yml')))
 ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
 ActiveRecord::Base.establish_connection(dbconfig['test'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Citus Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -122,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email: engage@citusdata.com
 executables: []
@@ -140,8 +168,6 @@ files:
 - docker-compose.yml
 - gemfiles/active_record_5.1.gemfile
 - gemfiles/active_record_5.1.gemfile.lock
-- gemfiles/rails_3.2.gemfile
-- gemfiles/rails_3.2.gemfile.lock
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.0.gemfile.lock
 - gemfiles/rails_4.1.gemfile

data/gemfiles/rails_3.2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "test-unit", "~> 3.0"
-gem "rails", "3.2.22.5"
-
-gemspec :path => "../"

data/gemfiles/rails_3.2.gemfile.lock

@@ -1,145 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    activerecord-multi-tenant (0.7.0)
-      rails (>= 3.1)
-      request_store (>= 1.0.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.22.5)
-      actionpack (= 3.2.22.5)
-      mail (~> 2.5.4)
-    actionpack (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (3.0.3)
-    builder (3.0.4)
-    concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.8.1)
-    journey (1.0.4)
-    json (1.8.6)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    multi_json (1.12.1)
-    pg (0.20.0)
-    polyglot (0.3.5)
-    power_assert (1.0.1)
-    rack (1.4.7)
-    rack-cache (1.7.0)
-      rack (>= 0.4)
-    rack-protection (2.0.0)
-      rack
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (3.2.22.5)
-      actionmailer (= 3.2.22.5)
-      actionpack (= 3.2.22.5)
-      activerecord (= 3.2.22.5)
-      activeresource (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      bundler (~> 1.0)
-      railties (= 3.2.22.5)
-    railties (3.2.22.5)
-      actionpack (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (12.0.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    redis (3.3.3)
-    request_store (1.3.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sidekiq (5.0.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 3.3, >= 3.3.3)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    test-unit (3.2.3)
-      power_assert
-    thor (0.19.4)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.53)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-multi-tenant!
-  appraisal
-  pg
-  rails (= 3.2.22.5)
-  rake
-  rspec (>= 3.0)
-  rspec-rails
-  sidekiq
-  test-unit (~> 3.0)
-  thor
-
-BUNDLED WITH
-   1.15.1