activerecord-multi-tenant 1.0.0 → 1.1.0

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

@@ -4,14 +4,14 @@ require 'activerecord-multi-tenant/sidekiq'
 
 describe MultiTenant, 'Sidekiq' do
   let(:server) { Sidekiq::Middleware::MultiTenant::Server.new }
+  let(:account) { Account.create(name: 'test') }
 
   describe 'server middleware' do
     it 'sets the multitenant context when provided in message' do
-      tenant_id = 1234
-      server.call(double, {'bogus' => 'message',
-        'multi_tenant' => { 'class' => MultiTenant.current_tenant_class, 'id' => tenant_id}},
+      server.call(double,{'bogus' => 'message',
+        'multi_tenant' => { 'class' => account.class.name, 'id' => account.id}},
         'bogus_queue') do
-        expect(MultiTenant.current_tenant).to eq(tenant_id)
+        expect(MultiTenant.current_tenant).to eq(account)
       end
     end
 

data/spec/schema.rb

@@ -181,10 +181,7 @@ end
 class Comment < ActiveRecord::Base
   multi_tenant :account
   belongs_to :commentable, polymorphic: true
-
-  if ActiveRecord::VERSION::MAJOR >= 4
-    belongs_to :task, -> { where(comments: { commentable_type: 'Task'  }) }, foreign_key: 'commentable_id'
-  end
+  belongs_to :task, -> { where(comments: { commentable_type: 'Task'  }) }, foreign_key: 'commentable_id'
 end
 
 class Organization < ActiveRecord::Base

data/spec/spec_helper.rb

@@ -43,12 +43,7 @@ MultiTenantTest::Application.config.secret_token = 'x' * 40
 MultiTenantTest::Application.config.secret_key_base = 'y' * 40
 
 def uses_prepared_statements?
-  if ActiveRecord::VERSION::MAJOR == 4
-    config = ActiveRecord::Base.connection.instance_variable_get(:@config)
-    config.fetch(:prepared_statements, true)
-  else
-    ActiveRecord::Base.connection.prepared_statements
-  end
+  ActiveRecord::Base.connection.prepared_statements
 end
 
 require 'schema'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Citus Data
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -167,22 +167,15 @@ files:
 - Rakefile
 - activerecord-multi-tenant.gemspec
 - docker-compose.yml
-- gemfiles/active_record_5.1.gemfile
-- gemfiles/active_record_5.1.gemfile.lock
+- gemfiles/.bundle/config
 - 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
-- gemfiles/rails_4.1.gemfile.lock
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_4.2.gemfile.lock
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.0.gemfile.lock
-- gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5.1.gemfile.lock
+- gemfiles/active_record_6.0.gemfile
+- gemfiles/active_record_6.0.gemfile.lock
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_5.2.gemfile.lock
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.0.gemfile.lock
 - lib/activerecord-multi-tenant.rb
 - lib/activerecord-multi-tenant/controller_extensions.rb
 - lib/activerecord-multi-tenant/copy_from_client.rb
@@ -190,6 +183,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
@@ -203,6 +197,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
@@ -211,7 +206,7 @@ homepage: https://github.com/citusdata/activerecord-multi-tenant
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,8 +221,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: ActiveRecord/Rails integration for multi-tenant databases, in particular
   the Citus extension for PostgreSQL

data/gemfiles/active_record_5.1.gemfile.lock

@@ -1,173 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    activerecord-multi-tenant (1.0.0)
-      rails (>= 4.0)
-      request_store (>= 1.0.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.1.0)
-      actionpack (= 5.1.0)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.0)
-      actionpack (= 5.1.0)
-      actionview (= 5.1.0)
-      activejob (= 5.1.0)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.1.0)
-      actionview (= 5.1.0)
-      activesupport (= 5.1.0)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.0)
-      activesupport (= 5.1.0)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.0)
-      activesupport (= 5.1.0)
-      globalid (>= 0.3.6)
-    activemodel (5.1.0)
-      activesupport (= 5.1.0)
-    activerecord (5.1.0)
-      activemodel (= 5.1.0)
-      activesupport (= 5.1.0)
-      arel (~> 8.0)
-    activesupport (5.1.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (8.0.0)
-    builder (3.2.3)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
-    diff-lcs (1.3)
-    erubi (1.6.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (0.8.1)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    method_source (0.8.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nio4r (2.3.1)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    pg (0.20.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    rack (2.0.5)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.1.0)
-      actioncable (= 5.1.0)
-      actionmailer (= 5.1.0)
-      actionpack (= 5.1.0)
-      actionview (= 5.1.0)
-      activejob (= 5.1.0)
-      activemodel (= 5.1.0)
-      activerecord (= 5.1.0)
-      activesupport (= 5.1.0)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.0)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.0)
-      actionpack (= 5.1.0)
-      activesupport (= 5.1.0)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    redis (3.3.3)
-    request_store (1.4.1)
-      rack (>= 1.4)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    sidekiq (4.2.10)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    slop (3.6.0)
-    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.19.4)
-    thread_safe (0.3.6)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 5.1.0)
-  activerecord-multi-tenant!
-  appraisal
-  pg
-  pry
-  pry-byebug
-  rake
-  rspec (>= 3.0)
-  rspec-rails
-  sidekiq
-  thor
-
-BUNDLED WITH
-   1.17.2

data/gemfiles/rails_4.0.gemfile

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

data/gemfiles/rails_4.0.gemfile.lock

@@ -1,141 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    activerecord-multi-tenant (1.0.0)
-      rails (>= 4.0)
-      request_store (>= 1.0.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.0.13)
-      actionpack (= 4.0.13)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (4.0.2)
-    builder (3.1.4)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    i18n (0.8.1)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    minitest (4.7.5)
-    multi_json (1.12.1)
-    pg (0.20.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    rack (1.5.5)
-    rack-protection (2.0.0)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.0.13)
-      actionmailer (= 4.0.13)
-      actionpack (= 4.0.13)
-      activerecord (= 4.0.13)
-      activesupport (= 4.0.13)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.13)
-      sprockets-rails (~> 2.0)
-    railties (4.0.13)
-      actionpack (= 4.0.13)
-      activesupport (= 4.0.13)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    redis (3.3.3)
-    request_store (1.4.1)
-      rack (>= 1.4)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sidekiq (5.0.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 3.3, >= 3.3.3)
-    slop (3.6.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tzinfo (0.3.53)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-multi-tenant!
-  appraisal
-  pg
-  pry
-  pry-byebug
-  rails (= 4.0.13)
-  rake
-  rspec (>= 3.0)
-  rspec-rails
-  sidekiq
-  thor
-
-BUNDLED WITH
-   1.17.2