activerecord-multi-tenant 1.0.4 → 1.1.0

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

@@ -18,7 +18,8 @@ module Sidekiq::Middleware::MultiTenant
   class Server
     def call(worker_class, msg, queue)
       if msg.has_key?('multi_tenant')
-        MultiTenant.with(msg['multi_tenant']['id']) do
+        tenant = msg['multi_tenant']['class'].constantize.find(msg['multi_tenant']['id'])
+        MultiTenant.with(tenant) do
           yield
         end
       else

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

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

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

@@ -21,11 +21,7 @@ describe "Controller Extensions", type: :controller do
   describe ApplicationController, type: :controller do
     controller do
       def index
-        if ActionPack::VERSION::MAJOR >= 5
-          render body: 'custom called'
-        else
-          render text: 'custom called'
-        end
+        render body: 'custom called'
       end
     end
 
@@ -35,30 +31,29 @@ describe "Controller Extensions", type: :controller do
     end
   end
 
-  if ActionPack::VERSION::MAJOR >= 5
-    class APIApplicationController < ActionController::API
-      include Rails.application.routes.url_helpers
-      set_current_tenant_through_filter
-      before_action :your_method_that_finds_the_current_tenant
 
-      def your_method_that_finds_the_current_tenant
-        current_account = Account.new
-        current_account.name = 'account1'
-        set_current_tenant(current_account)
-      end
+  class APIApplicationController < ActionController::API
+    include Rails.application.routes.url_helpers
+    set_current_tenant_through_filter
+    before_action :your_method_that_finds_the_current_tenant
+
+    def your_method_that_finds_the_current_tenant
+      current_account = Account.new
+      current_account.name = 'account1'
+      set_current_tenant(current_account)
     end
+  end
 
-    describe APIApplicationController, type: :controller do
-      controller do
-        def index
-          render body: 'custom called'
-        end
+  describe APIApplicationController, type: :controller do
+    controller do
+      def index
+        render body: 'custom called'
       end
+    end
 
-      it 'Finds the correct tenant using the filter command' do
-        get :index
-        expect(MultiTenant.current_tenant.name).to eq 'account1'
-      end
+    it 'Finds the correct tenant using the filter command' do
+      get :index
+      expect(MultiTenant.current_tenant.name).to eq 'account1'
     end
   end
 end

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

@@ -412,17 +412,13 @@ 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 > 0
+    expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5
                      <<-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
-                   elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 6
-                     <<-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"."account_id" = 1 AND "project_categories"."project_id" = "projects"."id" 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
                    else
                      <<-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" = "projects"."account_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
+                     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"."account_id" = 1 AND "project_categories"."project_id" = "projects"."id" 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
                    end
 
@@ -455,17 +451,13 @@ 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 > 0
+      expected_sql =  if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 5
                         <<-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
-                      elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 6
-                        <<-sql
-                        SELECT "tasks".* FROM "tasks" INNER JOIN "projects" ON "projects"."account_id" = 1 AND "projects"."id" = "tasks"."project_id" LEFT JOIN project_categories pc ON project.category_id = pc.id WHERE "tasks"."account_id" = 1
-                        sql
                       else
                         <<-sql
-                        SELECT "tasks".* FROM "tasks" INNER JOIN "projects" ON "projects"."id" = "tasks"."project_id" AND "projects"."account_id" = "tasks"."account_id" LEFT JOIN project_categories pc ON project.category_id = pc.id WHERE "projects"."account_id" = 1 AND "tasks"."account_id" = 1
+                        SELECT "tasks".* FROM "tasks" INNER JOIN "projects" ON "projects"."account_id" = 1 AND "projects"."id" = "tasks"."project_id" LEFT JOIN project_categories pc ON project.category_id = pc.id WHERE "tasks"."account_id" = 1
                         sql
                       end
 
@@ -497,17 +489,9 @@ describe MultiTenant do
                        <<-sql.strip
                                 SELECT "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT $2
                          sql
-                     elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR > 4
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT $2
-                         sql
-                     elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT 1
-                         sql
                      else
                        <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = #{project.id} LIMIT 1
+                         SELECT  "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT $2
                          sql
                      end
 
@@ -520,17 +504,9 @@ describe MultiTenant do
                        <<-sql.strip
                          SELECT "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
                          sql
-                     elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR > 4
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
-                         sql
-                     elsif uses_prepared_statements? && ActiveRecord::VERSION::MAJOR == 4
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT 1
-                         sql
                      else
                        <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."id" = #{project2.id} LIMIT 1
+                         SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
                          sql
                      end
 

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

@@ -90,4 +90,12 @@ describe "Query Rewriter" do
       }.to change { Project.count }.from(3).to(1)
     end
   end
+
+  context "when update without arel" do
+    it "can call method" do
+      expect {
+        ActiveRecord::Base.connection.update("SELECT 1")
+      }.not_to raise_error
+    end
+  end
 end

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.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Citus Data
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -168,18 +168,10 @@ files:
 - activerecord-multi-tenant.gemspec
 - docker-compose.yml
 - gemfiles/.bundle/config
-- gemfiles/active_record_5.1.gemfile
-- gemfiles/active_record_5.1.gemfile.lock
 - gemfiles/active_record_5.2.gemfile
 - gemfiles/active_record_5.2.gemfile.lock
 - gemfiles/active_record_6.0.gemfile
 - gemfiles/active_record_6.0.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/rails_5.2.gemfile
 - gemfiles/rails_5.2.gemfile.lock
 - gemfiles/rails_6.0.gemfile
@@ -214,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
@@ -229,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

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "activerecord", "~> 5.1.0"
-gem "i18n", "~> 0.9.5"
-gem "nokogiri", "~> 1.7.1"
-gem "nio4r", "~> 2.3.1"
-gem "sprockets", "~> 3.7.1"
-gem "byebug", "~> 9.0.6"
-gem "rake", "12.0.0"
-gem "redis", "3.3.3"
-
-gemspec path: "../"

data/gemfiles/active_record_5.1.gemfile.lock

@@ -1,180 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    activerecord-multi-tenant (1.0.4)
-      rails (>= 4.2)
-      request_store (>= 1.0.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.1.7)
-      actionpack (= 5.1.7)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.1.7)
-      actionview (= 5.1.7)
-      activesupport (= 5.1.7)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.7)
-      activesupport (= 5.1.7)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.7)
-      activesupport (= 5.1.7)
-      globalid (>= 0.3.6)
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activesupport (5.1.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      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.2)
-    concurrent-ruby (1.1.5)
-    connection_pool (2.2.2)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.9.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    loofah (2.3.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    method_source (0.9.2)
-    mini_mime (1.0.2)
-    mini_portile2 (2.1.0)
-    minitest (5.12.2)
-    nio4r (2.3.1)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
-    pg (1.1.4)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.4.3)
-      byebug (>= 9.0, < 9.1)
-      pry (~> 0.10)
-    rack (2.0.7)
-    rack-protection (2.0.7)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.1.7)
-      actioncable (= 5.1.7)
-      actionmailer (= 5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      activemodel (= 5.1.7)
-      activerecord (= 5.1.7)
-      activesupport (= 5.1.7)
-      bundler (>= 1.3.0)
-      railties (= 5.1.7)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (5.1.7)
-      actionpack (= 5.1.7)
-      activesupport (= 5.1.7)
-      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.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    sidekiq (5.0.4)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 3.3, >= 3.3.3)
-    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.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      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
-  byebug (~> 9.0.6)
-  i18n (~> 0.9.5)
-  nio4r (~> 2.3.1)
-  nokogiri (~> 1.7.1)
-  pg
-  pry
-  pry-byebug
-  rake (= 12.0.0)
-  redis (= 3.3.3)
-  rspec (>= 3.0)
-  rspec-rails
-  sidekiq
-  sprockets (~> 3.7.1)
-  thor
-
-BUNDLED WITH
-   1.17.3