activerecord-multi-tenant 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea9a26a7764b461bb053cb77385d032b68bec003
-  data.tar.gz: eb41e371832c04765affa48b9e484a604f35cef8
+  metadata.gz: 016f85503236d02b8e0c0c91d48d1b1ea1be8090
+  data.tar.gz: 98d861ee98e2453899c43ca479d40e0d3c072ad9
 SHA512:
-  metadata.gz: 31f075981d9b3f2bddc22648942c18425ecd8a30f78a4fb8535ece940c86461e7804f2c39f68b8fd01070e417234b8d54694de8fb803930ab8acbddd0952dcb3
-  data.tar.gz: c4e6b9305116e24a783db3efa200b952154976224411738a357bfbf6c084ea623f94382ae4f0d6bce8d1b194cde89733a5106401074ae6c2d55a7b4be9c5cf62
+  metadata.gz: c543e92bfaa83071358e43ee2fef050c0cd4692ef5a64b4e7a6fe5011a697e103e7e5b82b54314a937ea7f47a6fa6fda2516fac34419a4b42d609ce429642454
+  data.tar.gz: cb09591190ce05fc3737f71716b6d9850d4613b23baaa9f1967905413be8d32941de64be30c23b466f41f8c2bb9c033d5e1e3ff91c2571068de4aa9cabc97a5a

data/.travis.yml

@@ -14,7 +14,9 @@ gemfile:
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
   - gemfiles/active_record_5.1.gemfile
+  - gemfiles/active_record_5.2.gemfile
 
 matrix:
   fast_finish: true
@@ -29,7 +31,6 @@ services:
 
 before_install:
   - docker-compose up -d
-  - sleep 5 # wait for postgres to become available
 
 script:
   - bundle exec rake spec

data/Appraisals

@@ -18,6 +18,14 @@ appraise 'rails-5.1' do
   gem 'rails', '5.1.0'
 end
 
+appraise 'rails-5.2' do
+  gem 'rails', '5.2.0'
+end
+
 appraise 'active-record-5.1' do
   gem 'activerecord', '5.1.0'
 end
+
+appraise 'active-record-5.2' do
+  gem 'activerecord', '5.2.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.9.0       2018-06-22
+
+* ActiveRecord 5.2 support [Nathan Stitt](https://github.com/nathanstitt) & [osyo-manga](https://github.com/osyo-manga)
+
+
 ## 0.8.1       2017-10-06
 
 * Cast attribute name to a string to avoid double applying tenant clause [Ben Olive](https://github.com/sionide21)

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    activerecord-multi-tenant (0.8.1)
-      rails (>= 3.1)
+    activerecord-multi-tenant (0.9.0)
+      rails (>= 4.0)
       request_store (>= 1.0.5)
 
 GEM
@@ -57,22 +57,20 @@ GEM
     connection_pool (2.2.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
     i18n (0.7.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
     minitest (5.10.1)
     nio4r (1.2.1)
-    nokogiri (1.7.0)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
     pg (0.19.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -81,8 +79,8 @@ GEM
     pry-byebug (3.4.2)
       byebug (~> 9.0)
       pry (~> 0.10)
-    rack (2.0.1)
-    rack-protection (1.5.3)
+    rack (2.0.4)
+    rack-protection (2.0.1)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -111,7 +109,8 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     redis (3.3.3)
-    request_store (1.3.2)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -142,7 +141,7 @@ GEM
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -152,7 +151,7 @@ GEM
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -170,4 +169,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/README.md

@@ -37,7 +37,6 @@ end
 class Site < ActiveRecord::Base
   multi_tenant :customer
   has_many :page_views
-  belongs_to :customer
 
   # ...
 end
@@ -101,4 +100,4 @@ This gem was initially based on [acts_as_tenant](https://github.com/ErwinM/acts_
 ## License
 
 Licensed under the MIT license<br>
-Copyright (c) 2017, Citus Data Inc.
+Copyright (c) 2018, Citus Data Inc.

data/activerecord-multi-tenant.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
 
   s.add_runtime_dependency('request_store', '>= 1.0.5')
-  s.add_dependency('rails','>= 3.1')
+  s.add_dependency('rails','>= 4.0')
 
   s.add_development_dependency 'rspec', '>= 3.0'
   s.add_development_dependency 'rspec-rails'

data/docker-compose.yml

@@ -2,20 +2,20 @@ version: '2.1'
 
 services:
   master:
-    image: 'citusdata/citus:7.0.1'
-    ports: ['5600:5432']
+    container_name: "${COMPOSE_PROJECT_NAME:-citus}_master"
+    image: 'citusdata/citus:7.4.1'
+    ports: ["5600:5432"]
     labels: ['com.citusdata.role=Master']
-    volumes: ['/var/run/postgresql']
   worker1:
-    image: 'citusdata/citus:7.0.1'
+    image: 'citusdata/citus:7.4.1'
     labels: ['com.citusdata.role=Worker']
     depends_on: { manager: { condition: service_healthy } }
   worker2:
-    image: 'citusdata/citus:7.0.1'
+    image: 'citusdata/citus:7.4.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.1.0'
+    image: 'citusdata/membership-manager:0.2.0'
     volumes: ['/var/run/docker.sock:/var/run/docker.sock']
     depends_on: { master: { condition: service_healthy } }

data/gemfiles/active_record_5.1.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.1)
-      rails (>= 3.1)
+    activerecord-multi-tenant (0.9.0)
+      rails (>= 4.0)
       request_store (>= 1.0.5)
 
 GEM
@@ -57,20 +57,18 @@ GEM
     connection_pool (2.2.1)
     diff-lcs (1.3)
     erubi (1.6.0)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
     i18n (0.8.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mini_mime (1.0.0)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    nio4r (2.1.0)
+    nio4r (2.3.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     pg (0.20.0)
@@ -81,7 +79,7 @@ GEM
     pry-byebug (3.4.2)
       byebug (~> 9.0)
       pry (~> 0.10)
-    rack (2.0.1)
+    rack (2.0.5)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
@@ -111,7 +109,8 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     redis (3.3.3)
-    request_store (1.3.2)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -142,7 +141,7 @@ GEM
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -152,7 +151,7 @@ GEM
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -171,4 +170,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/gemfiles/active_record_5.2.gemfile

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

data/gemfiles/active_record_5.2.gemfile.lock

@@ -0,0 +1,182 @@
+PATH
+  remote: ..
+  specs:
+    activerecord-multi-tenant (0.9.0)
+      rails (>= 4.0)
+      request_store (>= 1.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    builder (3.2.3)
+    byebug (10.0.2)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    connection_pool (2.2.2)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    erubi (1.7.1)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nio4r (2.3.1)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    pg (1.0.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
+      pry (~> 0.10)
+    rack (2.0.5)
+    rack-protection (2.0.3)
+      rack
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    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.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.1)
+    redis (4.0.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    sidekiq (5.1.3)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 3.3.5, < 5)
+    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.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 5.2.0)
+  activerecord-multi-tenant!
+  appraisal
+  pg
+  pry
+  pry-byebug
+  rake
+  rspec (>= 3.0)
+  rspec-rails
+  sidekiq
+  thor
+
+BUNDLED WITH
+   1.16.1

data/gemfiles/rails_4.0.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.1)
-      rails (>= 3.1)
+    activerecord-multi-tenant (0.9.0)
+      rails (>= 4.0)
       request_store (>= 1.0.5)
 
 GEM
@@ -81,7 +81,8 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     redis (3.3.3)
-    request_store (1.3.2)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -137,4 +138,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/gemfiles/rails_4.1.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.1)
-      rails (>= 3.1)
+    activerecord-multi-tenant (0.9.0)
+      rails (>= 4.0)
       request_store (>= 1.0.5)
 
 GEM
@@ -85,7 +85,8 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     redis (3.3.3)
-    request_store (1.3.2)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -142,4 +143,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.1)
-      rails (>= 3.1)
+    activerecord-multi-tenant (0.9.0)
+      rails (>= 4.0)
       request_store (>= 1.0.5)
 
 GEM
@@ -108,7 +108,8 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     redis (3.3.3)
-    request_store (1.3.2)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -165,4 +166,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.1)
-      rails (>= 3.1)
+    activerecord-multi-tenant (0.9.0)
+      rails (>= 4.0)
       request_store (>= 1.0.5)
 
 GEM
@@ -111,7 +111,8 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     redis (3.3.3)
-    request_store (1.3.2)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -171,4 +172,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.1)
-      rails (>= 3.1)
+    activerecord-multi-tenant (0.9.0)
+      rails (>= 4.0)
       request_store (>= 1.0.5)
 
 GEM
@@ -111,7 +111,8 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     redis (3.3.3)
-    request_store (1.3.2)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -171,4 +172,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/gemfiles/rails_5.2.gemfile

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

data/gemfiles/rails_5.2.gemfile.lock

@@ -0,0 +1,182 @@
+PATH
+  remote: ..
+  specs:
+    activerecord-multi-tenant (0.9.0)
+      rails (>= 4.0)
+      request_store (>= 1.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    builder (3.2.3)
+    byebug (10.0.2)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    connection_pool (2.2.1)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    erubi (1.7.1)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.0.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nio4r (2.3.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    pg (1.0.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
+      pry (~> 0.10)
+    rack (2.0.5)
+    rack-protection (2.0.1)
+      rack
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    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.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.1)
+    redis (4.0.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    sidekiq (5.1.3)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 3.3.5, < 5)
+    sprockets (3.7.1)
+      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.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-multi-tenant!
+  appraisal
+  pg
+  pry
+  pry-byebug
+  rails (= 5.2.0)
+  rake
+  rspec (>= 3.0)
+  rspec-rails
+  sidekiq
+  thor
+
+BUNDLED WITH
+   1.16.1

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

@@ -5,6 +5,11 @@ module MultiTenant
       execute "SELECT create_distributed_table($$#{table_name}$$, $$#{partition_key}$$)"
     end
 
+    def create_reference_table(table_name)
+      return unless citus_version.present?
+      execute "SELECT create_reference_table($$#{table_name}$$)"
+    end
+
     def execute_on_all_nodes(sql)
       execute sql
 

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

@@ -29,6 +29,7 @@ module MultiTenant
     @@multi_tenant_models[table_name.to_s] = model_klass
   end
   def self.multi_tenant_model_for_table(table_name)
+    @@multi_tenant_models ||= {}
     @@multi_tenant_models[table_name.to_s]
   end
 

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

@@ -189,7 +189,7 @@ module MultiTenant
     def join_to_update(update, *args)
       update = super(update, *args)
       model = MultiTenant.multi_tenant_model_for_table(update.ast.relation.table_name)
-      if model.present?
+      if model.present? && !MultiTenant.with_write_only_mode_enabled?
         update.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
       end
       update
@@ -198,11 +198,29 @@ module MultiTenant
     def join_to_delete(delete, *args)
       delete = super(delete, *args)
       model = MultiTenant.multi_tenant_model_for_table(delete.ast.left.table_name)
-      if model.present?
+      if model.present? && !MultiTenant.with_write_only_mode_enabled?
         delete.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
       end
       delete
     end
+
+    if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 2
+      def update(arel, name = nil, binds = [])
+        model = MultiTenant.multi_tenant_model_for_table(arel.ast.relation.table_name)
+        if model.present? && !MultiTenant.with_write_only_mode_enabled?
+          arel.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
+        end
+        super(arel, name, binds)
+      end
+
+      def delete(arel, name = nil, binds = [])
+        model = MultiTenant.multi_tenant_model_for_table(arel.ast.left.table_name)
+        if model.present? && !MultiTenant.with_write_only_mode_enabled?
+          arel.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
+        end
+        super(arel, name, binds)
+      end
+    end
   end
 end
 
@@ -215,8 +233,8 @@ require 'active_record/relation'
 module ActiveRecord
   module QueryMethods
     alias :build_arel_orig :build_arel
-    def build_arel
-      arel = build_arel_orig
+    def build_arel(*args)
+      arel = build_arel_orig(*args)
 
       if MultiTenant.current_tenant_id && !MultiTenant.with_write_only_mode_enabled?
         visitor = MultiTenant::ArelTenantVisitor.new(arel)

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

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

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

@@ -14,19 +14,48 @@ describe "Query Rewriter" do
         end
       }.to change { project.reload.name }.from("Project 1").to("New Name")
     end
+
+    it "update the record" do
+      expect {
+        MultiTenant.with(account) do
+          project.update(name: "New Name")
+        end
+      }.to change { project.reload.name }.from("Project 1").to("New Name")
+    end
   end
 
   context "when bulk deleting" do
     let!(:account) { Account.create!(name: "Test Account") }
-    let!(:project) { Project.create(name: "Project 1", account: account) }
-    let!(:manager) { Manager.create(name: "Manager", project: project, account: account) }
+    let!(:project1) { Project.create(name: "Project 1", account: account) }
+    let!(:project2) { Project.create(name: "Project 2", account: account) }
+    let!(:project3) { Project.create(name: "Project 3", account: account) }
+    let!(:manager1) { Manager.create(name: "Manager 1", project: project1, account: account) }
+    let!(:manager2) { Manager.create(name: "Manager 2", project: project2, account: account) }
 
-    it "deletes the records" do
+    it "delete_all the records" do
       expect {
         MultiTenant.with(account) do
           Project.joins(:manager).delete_all
         end
-      }.to change { Project.count }.from(1).to(0)
+      }.to change { Project.count }.from(3).to(1)
+    end
+
+    it "delete the record" do
+      expect {
+        MultiTenant.with(account) do
+          project1.delete
+          Project.delete(project2.id)
+        end
+      }.to change { Project.count }.from(3).to(1)
+    end
+
+    it "destroy the record" do
+      expect {
+        MultiTenant.with(account) do
+          project1.destroy
+          Project.destroy(project2.id)
+        end
+      }.to change { Project.count }.from(3).to(1)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Citus Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2018-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,8 @@ files:
 - docker-compose.yml
 - gemfiles/active_record_5.1.gemfile
 - gemfiles/active_record_5.1.gemfile.lock
+- gemfiles/active_record_5.2.gemfile
+- gemfiles/active_record_5.2.gemfile.lock
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.0.gemfile.lock
 - gemfiles/rails_4.1.gemfile
@@ -178,6 +180,8 @@ files:
 - gemfiles/rails_5.0.gemfile.lock
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.1.gemfile.lock
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_5.2.gemfile.lock
 - lib/activerecord-multi-tenant.rb
 - lib/activerecord-multi-tenant/controller_extensions.rb
 - lib/activerecord-multi-tenant/copy_from_client.rb