diff --git a/Gemfile b/Gemfile index 19e7f2d5e..f876246a0 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" } ruby file: ".ruby-version" gem "rails", github: "rails/rails", branch: "main" -gem "active_record-tenanted", bc: "active_record-tenanted" +gem "active_record-tenanted", bc: "active_record-tenanted", branch: "fizzy-temporary" # Assets & front end gem "importmap-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 214bb8df5..4f3079ff6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GIT remote: https://github.com/basecamp/active_record-tenanted - revision: ac50c284049388344ba2603eae114e34fcf6bce0 + revision: d33ed3f81084946b4dbbc1d482d0aa342bd84873 + branch: fizzy-temporary specs: active_record-tenanted (0.1.0) activerecord (>= 8.1.alpha) diff --git a/config/initializers/tenanting.rb b/config/initializers/tenanting.rb index b05e90632..1a1debe67 100644 --- a/config/initializers/tenanting.rb +++ b/config/initializers/tenanting.rb @@ -1,3 +1,4 @@ Rails.application.configure do |config| - config.middleware.use ActiveRecord::Tenanted::TenantSelector, "ApplicationRecord", ->(request) { request.subdomain } + # uuugh this resolver proc is so gross. + config.middleware.use ActiveRecord::Tenanted::TenantSelector, "ApplicationRecord", ->(request) { request.subdomain.split(".").first } end