activerecord-multi-tenant 1.0.2 → 1.0.3

data/lib/activerecord-multi-tenant.rb

@@ -10,3 +10,4 @@ require_relative 'activerecord-multi-tenant/query_rewriter'
 require_relative 'activerecord-multi-tenant/query_monitor'
 require_relative 'activerecord-multi-tenant/version'
 require_relative 'activerecord-multi-tenant/with_lock'
+require_relative 'activerecord-multi-tenant/persistence_extension'

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

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module Persistence
+    alias :delete_orig :delete
+
+    def delete
+      if persisted? && MultiTenant.current_tenant_id.nil?
+        MultiTenant.with(self.public_send(self.class.partition_key)) { delete_orig }
+      else
+        delete_orig
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

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

@@ -348,15 +348,9 @@ describe MultiTenant do
   end
 
   it "applies the team_id conditions in the where clause" do
-    expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 0
-                     <<-sql
-                     SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" AND "sub_tasks"."account_id" = "tasks"."account_id" WHERE "tasks"."account_id" = 1 AND "tasks"."project_id" = 1
-                     sql
-                   else
-                     <<-sql
+    expected_sql = <<-sql
                      SELECT "sub_tasks".* FROM "sub_tasks" INNER JOIN "tasks" ON "sub_tasks"."task_id" = "tasks"."id" AND "sub_tasks"."account_id" = "tasks"."account_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'
 
@@ -418,7 +412,7 @@ describe MultiTenant do
     account1 = Account.create! name: 'Account 1'
     category1 = Category.create! name: 'Category 1'
 
-    expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR > 1
+    expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR > 0
                      <<-sql
                      SELECT "projects"."id" AS t0_r0, "projects"."account_id" AS t0_r1, "projects"."name" AS t0_r2, "categories"."id" AS t1_r0, "categories"."name" AS t1_r1 FROM "projects" LEFT OUTER JOIN "project_categories" ON "project_categories"."project_id" = "projects"."id" AND "project_categories"."account_id" = 1 AND "projects"."account_id" = 1 LEFT OUTER JOIN "categories" ON "categories"."id" = "project_categories"."category_id" AND "project_categories"."account_id" = 1 WHERE "projects"."account_id" = 1
                      sql
@@ -461,7 +455,7 @@ describe MultiTenant do
     category1 = Category.create! name: 'Category 1'
 
     MultiTenant.with(account1) do
-      expected_sql =  if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR > 1
+      expected_sql =  if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR > 0
                         <<-sql
                         SELECT "tasks".* FROM "tasks" INNER JOIN "projects" ON "projects"."id" = "tasks"."project_id" AND "projects"."account_id" = 1 LEFT JOIN project_categories pc ON project.category_id = pc.id WHERE "tasks"."account_id" = 1
                         sql

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

@@ -2,13 +2,57 @@ require 'spec_helper'
 
 describe MultiTenant, 'Record modifications' do
   let(:account) { Account.create! name: 'test' }
-  let(:project) { account.projects.create! name: 'something' }
+  let(:account2) { Account.create! name: 'test2' }
+  let(:project) { Project.create! name: 'something', account: account }
+  let(:project2) { Project.create! name: 'something2', account: account2, id: project.id }
+
+
+  it 'includes the tenant_id in DELETEs when using object.destroy' do
+    # two records with same id but different account_id
+    # when doing project.destroy it should delete only the current one
+    # by adding account_id to the destroy
+
+    expect(project.account).to eq(account)
+    expect(project2.account).to eq(account2)
+    expect(project.id).to eq(project2.id)
+
+    MultiTenant.without() do
+      expect(Project.count).to eq(2)
+      project.destroy
+      expect(Project.count).to eq(1)
+    end
+
+    MultiTenant.with(account) do
+      expect(Project.where(id: project.id).first).not_to be_present
+    end
+    MultiTenant.with(account2) do
+      expect(Project.where(id: project2.id).first).to be_present
+    end
+
+  end
+
+  it 'includes the tenant_id in DELETEs when using object.delete' do
+    # two records with same id but different account_id
+    # when project.delete it should delete only the current one
+    # by adding account_id to the destroy
+
+    expect(project.account).to eq(account)
+    expect(project2.account).to eq(account2)
+    expect(project.id).to eq(project2.id)
+
+    MultiTenant.without() do
+      expect(Project.count).to eq(2)
+      project.delete
+      expect(Project.count).to eq(1)
+    end
 
-  it 'includes the tenant_id in DELETEs' do
-    project.destroy
     MultiTenant.with(account) do
       expect(Project.where(id: project.id).first).not_to be_present
     end
+    MultiTenant.with(account2) do
+      expect(Project.where(id: project2.id).first).to be_present
+    end
+
   end
 
   it 'includes the tenant_id in UPDATEs' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Citus Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -191,6 +191,7 @@ files:
 - lib/activerecord-multi-tenant/migrations.rb
 - lib/activerecord-multi-tenant/model_extensions.rb
 - lib/activerecord-multi-tenant/multi_tenant.rb
+- lib/activerecord-multi-tenant/persistence_extension.rb
 - lib/activerecord-multi-tenant/query_monitor.rb
 - lib/activerecord-multi-tenant/query_rewriter.rb
 - lib/activerecord-multi-tenant/sidekiq.rb
@@ -204,6 +205,7 @@ files:
 - spec/activerecord-multi-tenant/record_callback_spec.rb
 - spec/activerecord-multi-tenant/record_finding_spec.rb
 - spec/activerecord-multi-tenant/record_modifications_spec.rb
+- spec/activerecord-multi-tenant/schema_dumper_tester.rb
 - spec/activerecord-multi-tenant/sidekiq_spec.rb
 - spec/database.yml
 - spec/schema.rb