activerecord-multi-tenant 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e167475943bea775b41d11e80881d5938607281e76076b5d0d847651a626f9ff
-  data.tar.gz: 2bbf2defbe8dd5c2b7e05b65f74bc55db00ce39d02dee2ee99f5b23f4cd5eee5
+  metadata.gz: 528bb716891e71b4d2acde0199b4f92e7c386e3b6ef7236f13571d973cbb235a
+  data.tar.gz: 9bc59a8cec70d0914aea960d2248c6d3d024569a11d0873fa1920fb3318ea3bb
 SHA512:
-  metadata.gz: 867f0dbe076cdf879d6e391bcce94e8bf4dd50a72afbec4a6dd0d386d1d245bf0f8fcd7b68b1e76b6eddd6340720d176a18781bf5afd2e4be58fbd87e02bbd0a
-  data.tar.gz: cfb1c04cb18a416501752cb308174e2f4a3167d830701f36c9a76065574d308311206aad8c26a43d4bcb9fea8e326d565e850ebcda4931e1da5c2d8289c378b0
+  metadata.gz: 4e7e8bf18a8d5b0d327caac9c40149fe8dabcd450ecd3737446b96609b37083530ee972d542f31c87935dbae9745bc4ff0349861649a159da2b27ec4facf671c
+  data.tar.gz: dd9e26bbc1b954c47e2cb5250c87bce73866733214f0a73c876e3237eadf95b9e26052ac69ed457db5f559057a81726d873a9f86490ba0ecaf36a39394e14423

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.1      2019-08-27
+
+* Ensure current tenant is present before adding tenant id filter in DatabaseStatements
+
 
 ## 1.0.0      2019-07-05
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-multi-tenant (1.0.0)
+    activerecord-multi-tenant (1.0.1)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 
@@ -79,7 +79,7 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.4.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     pg (1.1.4)
     pry (0.12.2)

data/gemfiles/active_record_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (1.0.0)
+    activerecord-multi-tenant (1.0.1)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 

data/gemfiles/active_record_5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (1.0.0)
+    activerecord-multi-tenant (1.0.1)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (1.0.0)
+    activerecord-multi-tenant (1.0.1)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (1.0.0)
+    activerecord-multi-tenant (1.0.1)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (1.0.0)
+    activerecord-multi-tenant (1.0.1)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (1.0.0)
+    activerecord-multi-tenant (1.0.1)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (1.0.0)
+    activerecord-multi-tenant (1.0.1)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (1.0.0)
+    activerecord-multi-tenant (1.0.1)
       rails (>= 4.0)
       request_store (>= 1.0.5)
 

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

@@ -223,7 +223,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? && !MultiTenant.with_write_only_mode_enabled?
+      if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
         update.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
       end
       update
@@ -232,7 +232,7 @@ 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? && !MultiTenant.with_write_only_mode_enabled?
+      if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
         delete.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
       end
       delete
@@ -241,7 +241,7 @@ module MultiTenant
     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?
+        if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
           arel.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
         end
         super(arel, name, binds)
@@ -249,7 +249,7 @@ module MultiTenant
 
       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?
+        if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
           arel.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
         end
         super(arel, name, binds)

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

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

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

@@ -15,6 +15,12 @@ describe "Query Rewriter" do
       }.to change { project.reload.name }.from("Project 1").to("New Name")
     end
 
+    it "updates the records without a current tenant" do
+      expect {
+        Project.joins(:manager).update_all(name: "New Name")
+      }.to change { project.reload.name }.from("Project 1").to("New Name")
+    end
+
     it "update the record" do
       expect {
         MultiTenant.with(account) do
@@ -22,6 +28,12 @@ describe "Query Rewriter" do
         end
       }.to change { project.reload.name }.from("Project 1").to("New Name")
     end
+
+    it "update the record without a current tenant" do
+      expect {
+        project.update(name: "New Name")
+      }.to change { project.reload.name }.from("Project 1").to("New Name")
+    end
   end
 
   context "when bulk deleting" do
@@ -40,6 +52,12 @@ describe "Query Rewriter" do
       }.to change { Project.count }.from(3).to(1)
     end
 
+    it "delete_all the records without a current tenant" do
+      expect {
+        Project.joins(:manager).delete_all
+      }.to change { Project.count }.from(3).to(1)
+    end
+
     it "delete the record" do
       expect {
         MultiTenant.with(account) do
@@ -49,6 +67,13 @@ describe "Query Rewriter" do
       }.to change { Project.count }.from(3).to(1)
     end
 
+    it "delete the record without a current tenant" do
+      expect {
+        project1.delete
+        Project.delete(project2.id)
+      }.to change { Project.count }.from(3).to(1)
+    end
+
     it "destroy the record" do
       expect {
         MultiTenant.with(account) do
@@ -57,5 +82,12 @@ describe "Query Rewriter" do
         end
       }.to change { Project.count }.from(3).to(1)
     end
+
+    it "destroy the record without a current tenant" do
+      expect {
+        project1.destroy
+        Project.destroy(project2.id)
+      }.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: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Citus Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store