activerecord-multi-tenant 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d6ecfbf3c596f4c97db44220ae47b9b17370060
-  data.tar.gz: a13da12778bcc68651a52fd03f25b5e99f32fee4
+  metadata.gz: 0692994e7b629c802155cdf7314b1b9178ec8897
+  data.tar.gz: 07e223afb891884df3e0f5cdf5b4d17149eb76fa
 SHA512:
-  metadata.gz: 40aab782eaa7eaf613f576febca765da3942d7678fe3ee3bad99fb7b0aa495dcb3bbac651d33eea5d5807461b42c934329a489a74d9c77691a310965ac1e7429
-  data.tar.gz: 0ff0d1fbf17c30c5730ec24e8f8274a0367af4382f790d67f97908c8ea4623676c312f6f3b14788237ab8698a41128ec84c5fcc4310902a51316d5ccac936d76
+  metadata.gz: da7f603099dab7a4c87492e26d4e602c7f11eb5cdd93bed4d9e8573b437cffd178e9380759d1e8934e28e87369fa0d7baca723dafd73202e2cf712f7128279c4
+  data.tar.gz: d51a45f8c081e5d9385c7a5e248efe398337028f497db8c8220cd56b096da9369e23e134a116d3f3fb0cada2e412dc52da24b0cc3688a3da98c6b738be4c9cb5

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.2       2017-02-16
+
+* Support blocks passed into the unscoped method (this fixes reload, amongst other issues)
+* Make with_lock work by adding workaround for Citus #1236 (SELECT ... FOR UPDATE is not router-plannable)
+
+
 ## 0.3.1       2017-02-13
 
 * Rails 5 API controller support [@mstahl](https://github.com/mstahl) [#4](https://github.com/citusdata/activerecord-multi-tenant/pull/4)

data/Gemfile.lock

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

data/lib/activerecord-multi-tenant.rb

@@ -6,3 +6,4 @@ require 'activerecord-multi-tenant/model_extensions'
 require 'activerecord-multi-tenant/multi_tenant'
 require 'activerecord-multi-tenant/referential_integrity'
 require 'activerecord-multi-tenant/version'
+require 'activerecord-multi-tenant/with_lock'

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

@@ -2,11 +2,13 @@ class ActiveRecord::Base
   class << self
     alias :unscoped_orig :unscoped
     def unscoped
-      if respond_to?(:scoped_by_tenant?) && MultiTenant.current_tenant_id
+      scope = if respond_to?(:scoped_by_tenant?) && MultiTenant.current_tenant_id
         unscoped_orig.where(arel_table[self.partition_key].eq(MultiTenant.current_tenant_id))
       else
         unscoped_orig
       end
+
+      block_given? ? scope.scoping { yield } : scope
     end
   end
 end

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

@@ -15,6 +15,11 @@ module MultiTenant
     "#{@@tenant_klass.to_s}_id"
   end
 
+  # Workaroud to make "with_lock" work until https://github.com/citusdata/citus/issues/1236 is fixed
+  @@enable_with_lock_workaround = false
+  def self.enable_with_lock_workaround; @@enable_with_lock_workaround = true; end
+  def self.with_lock_workaround_enabled?; @@enable_with_lock_workaround; end
+
   def self.current_tenant=(tenant)
     RequestStore.store[:current_tenant] = tenant
   end

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

@@ -1,5 +1,5 @@
-# Disable Rails trigger enable/disable mechanism used for test cases, since
-# DISABLE TRIGGER is not supported on distributed tables.
+# Workaround for https://github.com/citusdata/citus/issues/1080
+# "Support DISABLE/ENABLE TRIGGER ALL on distributed tables"
 
 module ActiveRecord
   module ConnectionAdapters

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

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

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

@@ -0,0 +1,17 @@
+# Workaround for https://github.com/citusdata/citus/issues/1236
+# "SELECT ... FOR UPDATE is not supported for router-plannable queries"
+
+class ActiveRecord::Base
+  alias :with_lock_orig :with_lock
+  def with_lock(&block)
+    if self.class.respond_to?(:scoped_by_tenant?) && MultiTenant.current_tenant_id && MultiTenant.with_lock_workaround_enabled?
+      transaction do
+        self.class.unscoped.where(id: id).update_all(id: id) # No-op UPDATE that locks the row
+        reload # This is just to act similar to the default Rails approach, in case someone relies on the reload
+        yield
+      end
+    else
+      with_lock_orig(&block)
+    end
+  end
+end

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

@@ -149,5 +149,28 @@ describe MultiTenant do
 
       expect(value).to eq "something"
     end
+
+    it 'supports reload inside the block' do
+      @account = Account.create!(name: 'foo')
+
+      MultiTenant.with @account do
+        project = @account.projects.create!(name: 'project')
+        project.reload
+        expect(project.name).to eq 'project'
+      end
+    end
+  end
+
+  describe '.with_lock' do
+    it 'supports with_lock blocks inside the block' do
+      @account = Account.create!(name: 'foo')
+
+      MultiTenant.with @account do
+        project = @account.projects.create!(name: 'project')
+        project.with_lock do
+          expect(project.name).to eq 'project'
+        end
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -23,6 +23,9 @@ RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner[:active_record].strategy = :transaction
     DatabaseCleaner[:active_record].clean_with(:truncation)
+
+    # Keep this here until https://github.com/citusdata/citus/issues/1236 is fixed in a patch release we can run tests with
+    MultiTenant.enable_with_lock_workaround
   end
 
   config.before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Citus Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -152,6 +152,7 @@ files:
 - lib/activerecord-multi-tenant/multi_tenant.rb
 - lib/activerecord-multi-tenant/referential_integrity.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/model_extensions_spec.rb
 - spec/activerecord-multi-tenant/record_callback_spec.rb