activerecord-multi-tenant 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79f35cfc24d053c192a889fcb387c764cf2580e350aa8c7db5ff4ea84d3c44df
-  data.tar.gz: 04bb2200ae11168efe55090482686b00e457f267696d110fec5669ae1e2c70fd
+  metadata.gz: fa2e595cc76e33a877613504121106791680118da0a0c4957ff1190e75e99c3a
+  data.tar.gz: 8a232e3431462d5b8b3972f0825664c210cc51729b2e94d08c5529851365d7f8
 SHA512:
-  metadata.gz: 5b807cc7064efd06487fa8995f49cfbfdc7b15e5ccbc1e84510e0c742d6b14f8e7168145e6a520c8ea613735621b799dc6478ed8a749db68c7020ebe936b73b1
-  data.tar.gz: 4e8aca6b32a413a54ecc900dc6e36ee57f06faf88504d4c4b210153456b5090aa8a2a660555c1587d1c1a06ae0126db3002e0cba0d0d935f0688f7bc84c9c362
+  metadata.gz: a2df2315ca041de29d2e82786a33904a9ac1dedd3f1ee4a2e470822cff977e9f4548ab0d33bd6eefec8055b9fc74ff8db2fdcf4c93cba4992aaaa681dcd1a695
+  data.tar.gz: 9da5eec93a1bcd33bff29ab1e0035022592802f512d27139608e92988a17365d3fe4cff0a73fc0f83e9513cea9dd2bf6233bb4deac9533320fb0884f7ef8b219

data/.github/workflows/CI.yml

@@ -0,0 +1,63 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+        gemfile:
+          - rails_5.2
+          - rails_6.0
+          - rails_6.1
+          - rails_7.0
+          - active_record_5.2
+          - active_record_6.0
+          - active_record_6.1
+          - active_record_7.0
+        prepared_statements: [true, false]
+        exclude:
+          # activesupport-7.0.0 requires ruby version >= 2.7.0
+          - ruby: '2.5'
+            gemfile: 'rails_7.0'
+          - ruby: '2.5'
+            gemfile: 'active_record_7.0'
+          - ruby: '2.6'
+            gemfile: 'rails_7.0'
+          - ruby: '2.6'
+            gemfile: 'active_record_7.0'
+          # ruby >3 and activesupport 5.2 are not compatible
+          - ruby: '3.0'
+            gemfile: 'rails_5.2'
+          - ruby: '3.0'
+            gemfile: 'active_record_5.2'
+          - ruby: '3.1'
+            gemfile: 'rails_5.2'
+          - ruby: '3.1'
+            gemfile: 'active_record_5.2'
+    name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }} ${{ (matrix.prepared_statements && 'w/ prepared statements') || '' }}
+    env:
+       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+       PREPARED_STATEMENTS: ${{ matrix.prepared_statements && '1' }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          docker-compose up -d
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: |
+          bundle exec rake spec

data/.gitignore

@@ -2,3 +2,5 @@ spec/debug.log
 pkg/
 *.rb#
 *.*~
+Gemfile.lock
+*.gemfile.lock

data/.rspec

@@ -0,0 +1 @@
+--force-color

data/Appraisals

@@ -18,6 +18,10 @@ appraise 'rails-6.1' do
   gem 'rails', '~> 6.1.0'
 end
 
+appraise 'rails-7.0' do
+  gem 'rails', '~> 7.0.0'
+end
+
 appraise 'active-record-5.2' do
   gem 'activerecord', '~> 5.2.0'
   gem 'i18n',  '~> 0.9.5'
@@ -37,3 +41,7 @@ end
 appraise 'active-record-6.1' do
   gem 'activerecord', '~> 6.1.0'
 end
+
+appraise 'active-record-7.0' do
+  gem 'activerecord', '~> 7.0.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.2.0      2022-03-29
+
+* Test Rails 7 & Ruby 3
+* Fix regression in 1.1.1 involving deleted tenants [#123](https://github.com/citusdata/activerecord-multi-tenant/pull/123)
+* Fix incorrect SQL generated when joining two models and one has a default scope [#132](https://github.com/citusdata/activerecord-multi-tenant/pull/132)
+* Update for Rails 5+ removal of type_cast_for_database [#135](https://github.com/citusdata/activerecord-multi-tenant/pull/135)
+
+
 ## 1.1.1      2021-01-15
 
 * Add support for Rails 6.1 [#108](https://github.com/citusdata/activerecord-multi-tenant/pull/108)

data/gemfiles/active_record_5.2.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "activerecord", "~> 5.2.0"
+gem "activerecord", "~> 5.2.0", "< 5.2.4" # FIXME
 gem "i18n", "~> 0.9.5"
 gem "nokogiri", "~> 1.7.1"
 gem "nio4r", "~> 2.3.1"

data/gemfiles/active_record_7.0.gemfile

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

data/gemfiles/rails_5.2.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 5.2.0", "< 5.2.4" # FIXME
 gem "i18n", "~> 0.9.5"
 gem "nokogiri", "~> 1.7.1"
 gem "nio4r", "~> 2.3.1"

data/gemfiles/rails_7.0.gemfile

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

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

@@ -9,7 +9,7 @@ module MultiTenant
     end
 
     def <<(row)
-      row = row.map.with_index { |val, idx| @column_types[idx].type_cast_for_database(val) }
+      row = row.map.with_index { |val, idx| @column_types[idx].serialize(val) }
       @conn.put_copy_data(row)
       @count += 1
     end
@@ -18,7 +18,7 @@ module MultiTenant
   module CopyFromClient
     def copy_from_client(columns, &block)
       conn         = connection.raw_connection
-      column_types = columns.map { |c| columns_hash[c.to_s] }
+      column_types = columns.map { |c| type_for_attribute(c.to_s) }
       helper = MultiTenant::CopyFromClientHelper.new(conn, column_types)
       conn.copy_data %{COPY #{quoted_table_name}("#{columns.join('","')}") FROM STDIN}, PG::TextEncoder::CopyRow.new do
         block.call helper

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

@@ -122,6 +122,8 @@ module MultiTenant
     alias :visit_Arel_Nodes_FullOuterJoin :visit_Arel_Nodes_OuterJoin
     alias :visit_Arel_Nodes_RightOuterJoin :visit_Arel_Nodes_OuterJoin
 
+    alias :visit_ActiveModel_Attribute :terminal
+
     private
 
     def tenant_relation?(table_name)
@@ -274,7 +276,11 @@ module ActiveRecord
                 if node.wheres.empty?
                   node.wheres = [enforcement_clause]
                 else
-                  node.wheres[0] = enforcement_clause.and(node.wheres[0])
+                  if node.wheres[0].is_a?(Arel::Nodes::And)
+                    node.wheres[0].children << enforcement_clause
+                  else
+                    node.wheres[0] = enforcement_clause.and(node.wheres[0])
+                  end
                 end
               else
                 raise "UnknownContext"

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

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

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

@@ -1,3 +1,3 @@
 module MultiTenant
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

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

@@ -348,9 +348,12 @@ describe MultiTenant do
   end
 
   it "applies the team_id conditions in the where clause" do
-    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
+    option1 = <<-sql.strip
+      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"."project_id" = 1 AND "sub_tasks"."account_id" = 1 AND "tasks"."account_id" = 1
+    sql
+    option2 = <<-sql.strip
+      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 "sub_tasks"."account_id" = 1 AND "tasks"."project_id" = 1 AND "tasks"."account_id" = 1
+    sql
 
     account1 = Account.create! name: 'Account 1'
 
@@ -358,7 +361,7 @@ describe MultiTenant do
       project1 = Project.create! name: 'Project 1'
       task1 = Task.create! name: 'Task 1', project: project1
       subtask1 = SubTask.create! task: task1
-      expect(project1.sub_tasks.to_sql).to eq(expected_sql.strip)
+      expect(project1.sub_tasks.to_sql).to eq(option1).or(eq(option2))
       expect(project1.sub_tasks).to include(subtask1)
     end
 
@@ -373,9 +376,13 @@ describe MultiTenant do
   end
 
   it "tests joins between distributed and reference table" do
-    expected_sql = <<-sql
-                     SELECT "categories".* FROM "categories" INNER JOIN "project_categories" ON "categories"."id" = "project_categories"."category_id" WHERE "project_categories"."account_id" = 1 AND "project_categories"."project_id" = 1
-                   sql
+    option1 = <<-sql.strip
+      SELECT "categories".* FROM "categories" INNER JOIN "project_categories" ON "categories"."id" = "project_categories"."category_id" WHERE "project_categories"."project_id" = 1 AND "project_categories"."account_id" = 1
+    sql
+    option2 = <<-sql.strip
+      SELECT "categories".* FROM "categories" INNER JOIN "project_categories" ON "categories"."id" = "project_categories"."category_id" WHERE "project_categories"."account_id" = 1 AND "project_categories"."project_id" = 1
+    sql
+
     account1 = Account.create! name: 'Account 1'
     category1 = Category.create! name: 'Category 1'
 
@@ -383,7 +390,7 @@ describe MultiTenant do
       project1 = Project.create! name: 'Project 1'
       projectcategory = ProjectCategory.create! name: 'project cat 1', project: project1, category: category1
 
-      expect(project1.categories.to_sql).to eq(expected_sql.strip)
+      expect(project1.categories.to_sql).to eq(option1).or(eq(option2))
       expect(project1.categories).to include(category1)
       expect(project1.project_categories).to include(projectcategory)
     end
@@ -412,21 +419,18 @@ 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::MAJOR == 6 && ActiveRecord::VERSION::MINOR >= 1))
-                     <<-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
-                   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"."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
+    option1 = <<-sql.strip
+      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
+    option2 = <<-sql.strip
+      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
 
     MultiTenant.with(account1) do
       project1 = Project.create! name: 'Project 1'
       projectcategory = ProjectCategory.create! name: 'project cat 1', project: project1, category: category1
 
-      expect(Project.eager_load(:categories).to_sql).to eq(expected_sql.strip)
+      expect(Project.eager_load(:categories).to_sql).to eq(option1).or(eq(option2))
 
       project = Project.eager_load(:categories).first
       expect(project.categories).to include(category1)
@@ -451,21 +455,18 @@ 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::MAJOR == 6 && ActiveRecord::VERSION::MINOR >= 1))
-                        <<-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
-                      else
-                        <<-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
-                      end
+      option1 = <<-sql.strip
+        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
+      option2 = <<-sql.strip
+        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
 
       project1 = Project.create! name: 'Project 1'
       projectcategory = ProjectCategory.create! name: 'project cat 1', project: project1, category: category1
 
       project1.tasks.create! name: 'baz'
-      expect(Task.joins(:project).joins('LEFT JOIN project_categories pc ON project.category_id = pc.id').to_sql).to eq(expected_sql.strip)
+      expect(Task.joins(:project).joins('LEFT JOIN project_categories pc ON project.category_id = pc.id').to_sql).to eq(option1).or(eq(option2))
     end
 
     MultiTenant.without do
@@ -485,32 +486,39 @@ describe MultiTenant do
     project2 = Project.create! name: 'Project 2', account: Account.create!(name: 'Account2')
 
     MultiTenant.with(account) do
-      expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR > 5
-                       <<-sql.strip
-                                SELECT "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT $2
-                         sql
-                     else
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT $2
-                         sql
-                     end
-
-      expect(Project).to receive(:find_by_sql).with(expected_sql, any_args).and_call_original
+      option1 = <<-sql.strip
+        SELECT "projects".* FROM "projects" WHERE "projects"."account_id" = #{account.id} AND "projects"."id" = $1 LIMIT $2
+      sql
+      option2 = <<-sql.strip
+        SELECT "projects".* FROM "projects" WHERE "projects"."id" = $1 AND "projects"."account_id" = #{account.id} LIMIT $2
+      sql
+      option3 = <<-sql.strip
+        SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 AND "projects"."account_id" = #{account.id} LIMIT $2
+      sql
+
+      # Couldn't make the following line pass for some reason, so came up with an uglier alternative
+      # expect(Project).to receive(:find_by_sql).with(eq(option1).or(eq(option2)).or(eq(option3)), any_args).and_call_original
+      expect(Project).to receive(:find_by_sql).and_wrap_original do |m, *args|
+        expect(args[0]).to(eq(option1).or(eq(option2)).or(eq(option3)))
+        m.call(args[0], args[1], preparable:args[2][:preparable])
+      end
       expect(Project.find(project.id)).to eq(project)
     end
 
     MultiTenant.without do
-      expected_sql = if uses_prepared_statements? && ActiveRecord::VERSION::MAJOR > 5
-                       <<-sql.strip
-                         SELECT "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
-                         sql
-                     else
-                       <<-sql.strip
-                         SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
-                         sql
-                     end
-
-      expect(Project).to receive(:find_by_sql).with(expected_sql, any_args).and_call_original
+      option1 = <<-sql.strip
+        SELECT "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
+      sql
+      option2 = <<-sql.strip
+        SELECT  "projects".* FROM "projects" WHERE "projects"."id" = $1 LIMIT $2
+      sql
+
+      # Couldn't make the following line pass for some reason, so came up with an uglier alternative
+      # expect(Project).to receive(:find_by_sql).with(eq(option1).or(eq(option2)), any_args).and_call_original
+      expect(Project).to receive(:find_by_sql).and_wrap_original do |m, *args|
+        expect(args[0]).to(eq(option1).or(eq(option2)))
+        m.call(args[0], args[1], preparable:args[2][:preparable])
+      end
       expect(Project.find(project2.id)).to eq(project2)
     end
   end

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

@@ -98,4 +98,21 @@ describe "Query Rewriter" do
       }.not_to raise_error
     end
   end
+
+  context "when joining with a model with a default scope" do
+    let!(:account) { Account.create!(name: "Test Account") }
+
+    it "fetches only records within the default scope" do
+      alive = Domain.create(name: "alive", account: account)
+      deleted = Domain.create(name: "deleted", deleted: true, account: account)
+      page_in_alive_domain = Page.create(name: "alive", account: account, domain: alive)
+      page_in_deleted_domain = Page.create(name: "deleted", account: account, domain: deleted)
+
+      expect(
+        MultiTenant.with(account) do
+          Page.joins(:domain).pluck(:id)
+        end
+      ).to eq([page_in_alive_domain.id])
+    end
+  end
 end

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

@@ -5,6 +5,9 @@ require 'activerecord-multi-tenant/sidekiq'
 describe MultiTenant, 'Sidekiq' do
   let(:server) { Sidekiq::Middleware::MultiTenant::Server.new }
   let(:account) { Account.create(name: 'test') }
+  let(:deleted_acount) { Account.create(name: 'deleted') }
+
+  before { deleted_acount.destroy! }
 
   describe 'server middleware' do
     it 'sets the multitenant context when provided in message' do
@@ -15,6 +18,14 @@ describe MultiTenant, 'Sidekiq' do
       end
     end
 
+    it 'sets the multitenant context (id) even if tenant not found' do
+      server.call(double,{'bogus' => 'message',
+        'multi_tenant' => { 'class' => deleted_acount.class.name, 'id' => deleted_acount.id}},
+        'bogus_queue') do
+        expect(MultiTenant.current_tenant).to eq(deleted_acount.id)
+      end
+    end
+
     it 'does not set the multitenant context when no tenant provided' do
       server.call(double, {'bogus' => 'message'}, 'bogus_queue') do
         expect(MultiTenant.current_tenant).to be_nil

data/spec/schema.rb

@@ -89,10 +89,21 @@ ARGV.grep(/\w+_spec\.rb/).empty? && ActiveRecord::Schema.define(version: 1) do
     t.column :category_id, :integer
   end
 
-
   create_table :allowed_places, force: true, id: false do |t|
-  t.string :account_id, :integer
-  t.string :name, :string
+    t.string :account_id, :integer
+    t.string :name, :string
+  end
+
+  create_table :domains, force: true, partition_key: :account_id do |t|
+    t.column :account_id, :integer
+    t.column :name, :string
+    t.column :deleted, :boolean, default: false
+  end
+
+  create_table :pages, force: true, partition_key: :account_id do |t|
+    t.column :account_id, :integer
+    t.column :name, :string
+    t.column :domain_id, :integer
   end
 
   create_distributed_table :accounts, :id
@@ -108,6 +119,8 @@ ARGV.grep(/\w+_spec\.rb/).empty? && ActiveRecord::Schema.define(version: 1) do
   create_distributed_table :uuid_records, :organization_id
   create_distributed_table :project_categories, :account_id
   create_distributed_table :allowed_places, :account_id
+  create_distributed_table :domains, :account_id
+  create_distributed_table :pages, :account_id
   create_reference_table :categories
 end
 
@@ -204,7 +217,17 @@ class ProjectCategory < ActiveRecord::Base
   belongs_to :account
 end
 
-
 class AllowedPlace < ActiveRecord::Base
   multi_tenant :account
 end
+
+class Domain < ActiveRecord::Base
+  multi_tenant :account
+  has_many :pages
+  default_scope { where(deleted: false) }
+end
+
+class Page < ActiveRecord::Base
+  multi_tenant :account
+  belongs_to :domain
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-multi-tenant
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Citus Data
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -156,12 +156,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/CI.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rspec"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -169,17 +169,13 @@ files:
 - docker-compose.yml
 - gemfiles/.bundle/config
 - 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/active_record_6.1.gemfile
-- gemfiles/active_record_6.1.gemfile.lock
+- gemfiles/active_record_7.0.gemfile
 - gemfiles/rails_5.2.gemfile
-- gemfiles/rails_5.2.gemfile.lock
 - gemfiles/rails_6.0.gemfile
-- gemfiles/rails_6.0.gemfile.lock
 - gemfiles/rails_6.1.gemfile
-- gemfiles/rails_6.1.gemfile.lock
+- gemfiles/rails_7.0.gemfile
 - lib/activerecord-multi-tenant.rb
 - lib/activerecord-multi-tenant/arel_visitors_depth_first.rb
 - lib/activerecord-multi-tenant/controller_extensions.rb
@@ -211,7 +207,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 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: ActiveRecord/Rails integration for multi-tenant databases, in particular
   the Citus extension for PostgreSQL

data/.travis.yml

@@ -1,34 +0,0 @@
-sudo: required
-cache: bundler
-
-language: ruby
-
-rvm:
-  - 2.5.8
-  - 2.6.4
-  - 2.7.1
-
-gemfile:
-  - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.gemfile
-  - gemfiles/rails_6.1.gemfile
-  - gemfiles/active_record_5.2.gemfile
-  - gemfiles/active_record_6.0.gemfile
-  - gemfiles/active_record_6.1.gemfile
-
-env:
-  - PREPARED_STATEMENTS=0
-  - PREPARED_STATEMENTS=1
-
-matrix:
-  fast_finish: true
-
-services:
-  - docker
-
-before_install:
-  - docker-compose up -d
-  - gem install bundler -v 2.1.4
-
-script:
-  - bundle exec rake spec