activerecord-multi-tenant 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f0a1949a56f1bf5bbf3c5e4e00f0e5afdc87f8
-  data.tar.gz: bcf4da0d8b2228a3cac88ca747286beabfb543c8
+  metadata.gz: ea9a26a7764b461bb053cb77385d032b68bec003
+  data.tar.gz: eb41e371832c04765affa48b9e484a604f35cef8
 SHA512:
-  metadata.gz: 54f89ab0a2b8b648a55be5de6e31fbf7acbafb125f530348bc30b0e1ddde48444a0be30aa60c54ee17e075fbc0f868aae45b94277daf977e1d0160385fe1d426
-  data.tar.gz: 60483177cedff455c9faafdfe6f3370cfd09ab90bbb5c5ed10a1c4b71c606c425f325611c063f77441d0647b66093fc30661b8bba7ee346121acb98bd8a18fab
+  metadata.gz: 31f075981d9b3f2bddc22648942c18425ecd8a30f78a4fb8535ece940c86461e7804f2c39f68b8fd01070e417234b8d54694de8fb803930ab8acbddd0952dcb3
+  data.tar.gz: c4e6b9305116e24a783db3efa200b952154976224411738a357bfbf6c084ea623f94382ae4f0d6bce8d1b194cde89733a5106401074ae6c2d55a7b4be9c5cf62

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.8.1       2017-10-06
+
+* Cast attribute name to a string to avoid double applying tenant clause [Ben Olive](https://github.com/sionide21)
+* Allow bulk delete/update with subqueries on joins [Kyle Bock](https://github.com/kwbock)
+
+
 ## 0.8.0       2017-08-16
 
 * Significant improvements and simplifications of query rewriting

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-multi-tenant (0.8.0)
+    activerecord-multi-tenant (0.8.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

data/docker-compose.yml

@@ -1,18 +1,21 @@
-version: '2'
+version: '2.1'
 
 services:
   master:
-    image: 'citusdata/citus:6.2.3'
+    image: 'citusdata/citus:7.0.1'
     ports: ['5600:5432']
     labels: ['com.citusdata.role=Master']
     volumes: ['/var/run/postgresql']
   worker1:
-    image: 'citusdata/citus:6.2.3'
+    image: 'citusdata/citus:7.0.1'
     labels: ['com.citusdata.role=Worker']
+    depends_on: { manager: { condition: service_healthy } }
   worker2:
-    image: 'citusdata/citus:6.2.3'
+    image: 'citusdata/citus:7.0.1'
     labels: ['com.citusdata.role=Worker']
-  config:
-    image: 'citusdata/workerlist-gen:2.0.0'
-    volumes: ['/var/run/docker.sock:/tmp/docker.sock']
-    volumes_from: ['master']
+    depends_on: { manager: { condition: service_healthy } }
+  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 } }

data/gemfiles/active_record_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.0)
+    activerecord-multi-tenant (0.8.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.0)
+    activerecord-multi-tenant (0.8.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.0)
+    activerecord-multi-tenant (0.8.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.0)
+    activerecord-multi-tenant (0.8.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.0)
+    activerecord-multi-tenant (0.8.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activerecord-multi-tenant (0.8.0)
+    activerecord-multi-tenant (0.8.1)
       rails (>= 3.1)
       request_store (>= 1.0.5)
 

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

@@ -75,7 +75,7 @@ module MultiTenant
       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
+        @current_context.visited_handled_relation(o.left.relation) if model.present? && o.left.name.to_s == model.partition_key.to_s
       end
       super(o, *args)
     end
@@ -184,8 +184,31 @@ module MultiTenant
       end
     end
   end
+
+  module DatabaseStatements
+    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?
+        update.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
+      end
+      update
+    end
+
+    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?
+        delete.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
+      end
+      delete
+    end
+  end
 end
 
+require 'active_record/connection_adapters/abstract_adapter'
+ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(MultiTenant::DatabaseStatements)
+
 Arel::Visitors::ToSql.include(MultiTenant::TenantValueVisitor)
 
 require 'active_record/relation'

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

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

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

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "Query Rewriter" do
+
+  context "when bulk updating" 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) }
+
+    it "updates the records" do
+      expect {
+        MultiTenant.with(account) do
+          Project.joins(:manager).update_all(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) }
+
+    it "deletes the records" do
+      expect {
+        MultiTenant.with(account) do
+          Project.joins(:manager).delete_all
+        end
+      }.to change { Project.count }.from(1).to(0)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Citus Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -194,6 +194,7 @@ files:
 - 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/query_rewriter_spec.rb
 - spec/activerecord-multi-tenant/record_callback_spec.rb
 - spec/activerecord-multi-tenant/record_finding_spec.rb
 - spec/activerecord-multi-tenant/record_modifications_spec.rb