activerecord-multi-tenant 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 016f85503236d02b8e0c0c91d48d1b1ea1be8090
-  data.tar.gz: 98d861ee98e2453899c43ca479d40e0d3c072ad9
+  metadata.gz: 366debe159c5693b73fbca961fae7889febd5e00
+  data.tar.gz: 3670f0bd43e9074463c44e397ccbc1f25246bd4d
 SHA512:
-  metadata.gz: c543e92bfaa83071358e43ee2fef050c0cd4692ef5a64b4e7a6fe5011a697e103e7e5b82b54314a937ea7f47a6fa6fda2516fac34419a4b42d609ce429642454
-  data.tar.gz: cb09591190ce05fc3737f71716b6d9850d4613b23baaa9f1967905413be8d32941de64be30c23b466f41f8c2bb9c033d5e1e3ff91c2571068de4aa9cabc97a5a
+  metadata.gz: 9274691cbc15fcba204a5b9fcd01e550aefddcf3b0b37ec1aa329a66637dffb8e22d08b6fd9e55f63d42b2582146d544552921f8558722b047f31fb8f66fb9f1
+  data.tar.gz: 8e162537b956585c28734850d8f189433d8337854df10c9a1bf16637000c9c448eed6739763c8e20a488edf7d43743ea84254a137f0d77c6b7c84318a10d3c4b

data/.travis.yml

@@ -18,6 +18,10 @@ gemfile:
   - gemfiles/active_record_5.1.gemfile
   - gemfiles/active_record_5.2.gemfile
 
+env:
+  - PREPARED_STATEMENTS=0
+  - PREPARED_STATEMENTS=1
+
 matrix:
   fast_finish: true
   exclude:

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 0.10.0      2019-05-31
+
+* Add `MultiTenant.without` to remove already set tenant context in a block [#45](https://github.com/citusdata/activerecord-multi-tenant/pull/45) [Jackson Miller](https://github.com/jaxn)
+* Fix uninitialized constant X::ActiveRecord::VERSION [#42](https://github.com/citusdata/activerecord-multi-tenant/pull/42) [vollnhals](https://github.com/vollnhals)
+* Fix find and find_by caching issues
+  - This builds on work by multiple contributors, and fixes issues where the
+    tenant_id would be cached across different tenant contexts for find
+    and find_by methods. This issue was only present with prepared
+    statements turned on
+  -  Note that the mechanism to solve this is slightly different for Rails 4
+    and 5:
+    - Rails 4: Disable any caching for find and find_by methods
+    - Rails 5: Explicitly add the current_tenant_id into the cache key
+  - This also ensures that we test both prepared statements on and off
+    on Travis
+* Added method to ensure that the current tenant is loaded [#49](https://github.com/citusdata/activerecord-multi-tenant/pull/49) [Stephen Bussey](https://github.com/sb8244)
+  - This is ideal for fully utilizing the ActiveRecord extensions, as they only take effect when the
+    current tenant is not an ID
+* Update loofah and rack to fix security warnings
+  - Note that loofah is not a direct dependency of the libary, so this only
+    applies when running the test suite
+* Remove monkey patch that previously disabled referential integrity (DISABLE/ENABLE TRIGGER ALL) [#53](https://github.com/citusdata/activerecord-multi-tenant/pull/53) [Rémi Piotaix](https://github.com/piotaixr)
+  - This was required for Citus compatibility, but the issue has been fixed in
+    Citus for over a year (https://github.com/citusdata/citus/issues/1080)
+
+
 ## 0.9.0       2018-06-22
 
 * ActiveRecord 5.2 support [Nathan Stitt](https://github.com/nathanstitt) & [osyo-manga](https://github.com/osyo-manga)

data/Gemfile.lock

@@ -1,75 +1,85 @@
 PATH
   remote: .
   specs:
-    activerecord-multi-tenant (0.9.0)
+    activerecord-multi-tenant (0.10.0)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.1)
-      actionpack (= 5.0.1)
-      nio4r (~> 1.2)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
+    actioncable (5.2.2)
+      actionpack (= 5.2.2)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.1)
-      activesupport (= 5.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.1)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activestorage (5.2.2)
+      actionpack (= 5.2.2)
+      activerecord (= 5.2.2)
+      marcel (~> 0.3.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (7.1.4)
-    builder (3.2.2)
+    arel (9.0.0)
+    builder (3.2.3)
     byebug (9.0.6)
     coderay (1.1.1)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.1.3)
     connection_pool (2.2.1)
+    crass (1.0.4)
     diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.4.1)
+    erubi (1.7.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.7.0)
-    loofah (2.0.3)
+    i18n (1.1.1)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     method_source (0.8.2)
-    mini_mime (1.0.0)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
-    minitest (5.10.1)
-    nio4r (1.2.1)
-    nokogiri (1.8.2)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     pg (0.19.0)
     pry (0.10.4)
@@ -79,35 +89,36 @@ GEM
     pry-byebug (3.4.2)
       byebug (~> 9.0)
       pry (~> 0.10)
-    rack (2.0.4)
+    rack (2.0.6)
     rack-protection (2.0.1)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.1)
-      actioncable (= 5.0.1)
-      actionmailer (= 5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
-      activemodel (= 5.0.1)
-      activerecord (= 5.0.1)
-      activesupport (= 5.0.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.1)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.2)
+      actioncable (= 5.2.2)
+      actionmailer (= 5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      activemodel (= 5.2.2)
+      activerecord (= 5.2.2)
+      activestorage (= 5.2.2)
+      activesupport (= 5.2.2)
+      bundler (>= 1.3.0)
+      railties (= 5.2.2)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.1)
     redis (3.3.3)
     request_store (1.4.1)
       rack (>= 1.4)
@@ -138,18 +149,18 @@ GEM
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
     slop (3.6.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
 
@@ -169,4 +180,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.16.1
+   2.0.1

data/LICENSE

@@ -0,0 +1,18 @@
+Copyright (c) 2018, Citus Data Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -99,5 +99,5 @@ This gem was initially based on [acts_as_tenant](https://github.com/ErwinM/acts_
 
 ## License
 
-Licensed under the MIT license<br>
-Copyright (c) 2018, Citus Data Inc.
+Copyright (c) 2018, Citus Data Inc.<br>
+Licensed under the MIT license, see LICENSE file for details.

data/docker-compose.yml

@@ -2,20 +2,25 @@ version: '2.1'
 
 services:
   master:
-    container_name: "${COMPOSE_PROJECT_NAME:-citus}_master"
-    image: 'citusdata/citus:7.4.1'
-    ports: ["5600:5432"]
+    image: 'citusdata/citus:7.5.1'
+    ports: ['5600:5432']
     labels: ['com.citusdata.role=Master']
+    volumes: ['/var/run/postgresql']
+  manager:
+    container_name: "${COMPOSE_PROJECT_NAME:-citus}_manager"
+    image: 'citusdata/membership-manager:0.1.0'
+    volumes: ['/var/run/docker.sock:/var/run/docker.sock']
+    depends_on: { master: { condition: service_healthy } }
   worker1:
-    image: 'citusdata/citus:7.4.1'
+    image: 'citusdata/citus:7.5.1'
     labels: ['com.citusdata.role=Worker']
     depends_on: { manager: { condition: service_healthy } }
   worker2:
-    image: 'citusdata/citus:7.4.1'
+    image: 'citusdata/citus:7.5.1'
     labels: ['com.citusdata.role=Worker']
     depends_on: { manager: { condition: service_healthy } }
-  manager:
-    container_name: "${COMPOSE_PROJECT_NAME:-citus}_manager"
-    image: 'citusdata/membership-manager:0.2.0'
-    volumes: ['/var/run/docker.sock:/var/run/docker.sock']
-    depends_on: { master: { condition: service_healthy } }
+  healthcheck:
+    image: busybox
+    depends_on:
+      worker1: { condition: service_healthy }
+      worker2: { condition: service_healthy }

data/lib/activerecord-multi-tenant.rb

@@ -8,6 +8,5 @@ require_relative 'activerecord-multi-tenant/model_extensions'
 require_relative 'activerecord-multi-tenant/multi_tenant'
 require_relative 'activerecord-multi-tenant/query_rewriter'
 require_relative 'activerecord-multi-tenant/query_monitor'
-require_relative 'activerecord-multi-tenant/referential_integrity'
 require_relative 'activerecord-multi-tenant/version'
 require_relative 'activerecord-multi-tenant/with_lock'

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

@@ -23,7 +23,7 @@ module MultiTenant
           # Avoid primary_key errors when using composite primary keys (e.g. id, tenant_id)
           def primary_key
             return @primary_key if @primary_key
-            return @primary_key = super || DEFAULT_ID_FIELD if ActiveRecord::VERSION::MAJOR < 5
+            return @primary_key = super || DEFAULT_ID_FIELD if ::ActiveRecord::VERSION::MAJOR < 5
 
             primary_object_keys = Array.wrap(connection.schema_cache.primary_keys(table_name)) - [partition_key]
             if primary_object_keys.size == 1
@@ -112,3 +112,13 @@ end
 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
+  end
+end

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

@@ -57,6 +57,13 @@ module MultiTenant
     end
   end
 
+  def self.load_current_tenant!
+    return MultiTenant.current_tenant if MultiTenant.current_tenant && !current_tenant_is_id?
+    raise 'MultiTenant.current_tenant must be set to load' if MultiTenant.current_tenant.nil?
+    klass = MultiTenant.default_tenant_class || fail('Only have tenant id, and no default tenant class set')
+    self.current_tenant = klass.find(MultiTenant.current_tenant_id)
+  end
+
   def self.with(tenant, &block)
     return block.call if self.current_tenant == tenant
     old_tenant = self.current_tenant
@@ -68,6 +75,17 @@ module MultiTenant
     end
   end
 
+  def self.without(&block)
+    return block.call if self.current_tenant.nil?
+    old_tenant = self.current_tenant
+    begin
+      self.current_tenant = nil
+      return block.call
+    ensure
+      self.current_tenant = old_tenant
+    end
+  end
+
   # Preserve backward compatibility for people using .with_id
   singleton_class.send(:alias_method, :with_id, :with)
 

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

@@ -155,11 +155,7 @@ module MultiTenant
     def to_str; to_sql; end
 
     def to_sql(*)
-      if MultiTenant.current_tenant_id
-        tenant_arel.to_sql
-      else
-        '1=1'
-      end
+      tenant_arel.to_sql
     end
 
     private
@@ -264,3 +260,68 @@ module ActiveRecord
     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
+
+      # 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
+  end
+end
+
+ActiveRecord::Base.singleton_class.prepend(MultiTenantFindBy)

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

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

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

@@ -274,6 +274,40 @@ describe MultiTenant do
     end
   end
 
+  # ::without
+  describe "::without" do
+    it "should unset current_tenant inside the block" do
+      @account = Account.create!(:name => 'baz')
+
+      MultiTenant.current_tenant = @account
+      MultiTenant.without do
+        expect(MultiTenant.current_tenant).to eq(nil)
+      end
+    end
+
+    it "should reset current_tenant to the previous tenant once exiting the block" do
+      @account1 = Account.create!(:name => 'foo')
+
+      MultiTenant.current_tenant = @account1
+      MultiTenant.without do
+
+      end
+
+      expect(MultiTenant.current_tenant).to eq(@account1)
+    end
+
+    it "should return the value of the block" do
+      @account1 = Account.create!(:name => 'foo')
+
+      MultiTenant.current_tenant = @account1
+      value = MultiTenant.without do
+        "something"
+      end
+
+      expect(value).to eq "something"
+    end
+  end
+
   describe '.with_lock' do
     it 'supports with_lock blocks inside the block' do
       @account = Account.create!(name: 'foo')
@@ -309,9 +343,15 @@ 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" WHERE "tasks"."account_id" = 1 AND "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = 1
-    sql
+    expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR < 2
+                     <<-sql
+                     SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" WHERE "tasks"."account_id" = 1 AND "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = $1
+                     sql
+                   else
+                     <<-sql
+                     SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" WHERE "tasks"."account_id" = 1 AND "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = 1
+                     sql
+                   end
     account1 = Account.create! name: 'Account 1'
 
     MultiTenant.with(account1) do
@@ -333,17 +373,37 @@ describe MultiTenant do
       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
+        expected_sql = if 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
         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
+      MultiTenant.without do
+        expected_sql = if 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
         expect(Project.find(project2.id)).to eq(project2)
       end

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

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+RSpec.describe MultiTenant do
+  describe ".load_current_tenant!" do
+    let(:fake_tenant) { OpenStruct.new(id: 1) }
+    let(:mock_klass) { double(find: fake_tenant) }
+
+    before do
+      @original_default_class = MultiTenant.default_tenant_class
+      MultiTenant.default_tenant_class = mock_klass
+    end
+
+    after do
+      MultiTenant.default_tenant_class = @original_default_class
+    end
+
+    it "sets and returns the loaded current_tenant" do
+      expect(mock_klass).to receive(:find).once.with(1)
+      MultiTenant.current_tenant = 1
+      expect(MultiTenant.load_current_tenant!).to eq(fake_tenant)
+      expect(MultiTenant.current_tenant).to eq(fake_tenant)
+    end
+
+    it "respects `.with` lifecycle" do
+      expect(mock_klass).to receive(:find).once.with(2)
+      expect(MultiTenant.current_tenant).to eq(nil)
+      MultiTenant.with(2) do
+        expect(MultiTenant.load_current_tenant!).to eq(fake_tenant)
+        expect(MultiTenant.current_tenant).to eq(fake_tenant)
+      end
+      expect(MultiTenant.current_tenant).to eq(nil)
+    end
+
+    context "with a loaded current_tenant" do
+      it "returns the tenant without fetching it" do
+        expect(mock_klass).not_to receive(:find)
+        MultiTenant.current_tenant = fake_tenant
+        expect(MultiTenant.load_current_tenant!).to eq(fake_tenant)
+      end
+    end
+
+    context "with a nil current_tenant" do
+      it "raises an error, as there is not enough information to load the tenant" do
+        expect(mock_klass).not_to receive(:find)
+        expect {
+          MultiTenant.load_current_tenant!
+        }.to raise_error(RuntimeError, 'MultiTenant.current_tenant must be set to load')
+      end
+    end
+
+    context "without a default class set" do
+      before do
+        MultiTenant.default_tenant_class = nil
+      end
+
+      it "raises an error, as there is not enough information to load the tenant" do
+        expect(mock_klass).not_to receive(:find)
+        MultiTenant.current_tenant = 1
+        expect {
+          MultiTenant.load_current_tenant!
+        }.to raise_error(RuntimeError, 'Only have tenant id, and no default tenant class set')
+      end
+    end
+  end
+end

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

@@ -16,4 +16,47 @@ describe MultiTenant, 'Record finding' do
       expect(UuidRecord.find(uuid_record.id)).to be_present
     end
   end
+
+  it 'can use find_bys accurately' do
+    first_tenant = Account.create! name: 'First Tenant'
+    second_tenant = Account.create! name: 'Second Tenant'
+    first_record = first_tenant.projects.create! name: 'identical name'
+    second_record = second_tenant.projects.create! name: 'identical name'
+
+    MultiTenant.with(first_tenant) do
+      found_record = Project.find_by(name: 'identical name')
+      expect(found_record).to eq(first_record)
+    end
+
+    MultiTenant.with(second_tenant) do
+      found_record = Project.find_by(name: 'identical name')
+      expect(found_record).to eq(second_record)
+    end
+  end
+
+  it 'can use find accurately' do
+    first_tenant = Account.create! name: 'First Tenant'
+    second_tenant = Account.create! name: 'Second Tenant'
+    first_record = first_tenant.projects.create!
+    second_record = second_tenant.projects.create!
+
+    MultiTenant.with(first_tenant) do
+      found_record = Project.find(first_record.id)
+      expect(found_record).to eq(first_record)
+      expect { Project.find(second_record.id) }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    MultiTenant.with(second_tenant) do
+      found_record = Project.find(second_record.id)
+      expect(found_record).to eq(second_record)
+      expect { Project.find(first_record.id) }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    MultiTenant.without do
+      first_found = Project.find(first_record.id)
+      expect(first_found).to eq(first_record)
+      second_found = Project.find(second_record.id)
+      expect(second_found).to eq(second_record)
+    end
+  end
 end

data/spec/database.yml

@@ -6,6 +6,6 @@ test:
   port: 5600
   pool: 5
   timeout: 5000
-  prepared_statements: false
+  prepared_statements: <%= ENV.fetch('PREPARED_STATEMENTS', '1') == '1' %>
   variables:
     citus.shard_count: 5

data/spec/spec_helper.rb

@@ -42,4 +42,13 @@ end
 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
+end
+
 require 'schema'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Citus Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-23 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -162,6 +162,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - activerecord-multi-tenant.gemspec
@@ -191,13 +192,13 @@ files:
 - lib/activerecord-multi-tenant/multi_tenant.rb
 - lib/activerecord-multi-tenant/query_monitor.rb
 - lib/activerecord-multi-tenant/query_rewriter.rb
-- lib/activerecord-multi-tenant/referential_integrity.rb
 - lib/activerecord-multi-tenant/sidekiq.rb
 - lib/activerecord-multi-tenant/version.rb
 - lib/activerecord-multi-tenant/with_lock.rb
 - spec/activerecord-multi-tenant/controller_extensions_spec.rb
 - spec/activerecord-multi-tenant/fast_truncate_spec.rb
 - spec/activerecord-multi-tenant/model_extensions_spec.rb
+- spec/activerecord-multi-tenant/multi_tenant_spec.rb
 - spec/activerecord-multi-tenant/query_rewriter_spec.rb
 - spec/activerecord-multi-tenant/record_callback_spec.rb
 - spec/activerecord-multi-tenant/record_finding_spec.rb

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

@@ -1,14 +0,0 @@
-# Workaround for https://github.com/citusdata/citus/issues/1080
-# "Support DISABLE/ENABLE TRIGGER ALL on distributed tables"
-
-require 'active_record/connection_adapters/postgresql_adapter'
-
-module ActiveRecord
-  module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
-      def supports_disable_referential_integrity?
-        false
-      end
-    end
-  end
-end