Improve error messages from UntenantedConnectionPool

Author: flavorjones

lib/active_record/tenanted/tenant.rb

@@ -78,7 +78,7 @@ def connection_pool # :nodoc:
 
             pool
           else
-            Tenanted::UntenantedConnectionPool.new(tenanted_root_config)
+            Tenanted::UntenantedConnectionPool.new(tenanted_root_config, self)
           end
         end
 

lib/active_record/tenanted/untenanted_connection_pool.rb

@@ -12,10 +12,11 @@ module Tenanted
     class UntenantedConnectionPool < ActiveRecord::ConnectionAdapters::NullPool # :nodoc:
       attr_reader :db_config
 
-      def initialize(db_config)
+      def initialize(db_config, model)
         super()
 
         @db_config = db_config
+        @model = model
       end
 
       def schema_cache
@@ -25,19 +26,19 @@ def schema_cache
       end
 
       def lease_connection(...)
-        raise Tenanted::NoTenantError, "Cannot connect to a tenanted database while untenanted."
+        raise Tenanted::NoTenantError, "Cannot connect to a tenanted database while untenanted (#{@model})."
       end
 
       def checkout(...)
-        raise Tenanted::NoTenantError, "Cannot connect to a tenanted database while untenanted."
+        raise Tenanted::NoTenantError, "Cannot connect to a tenanted database while untenanted (#{@model})."
       end
 
       def with_connection(...)
-        raise Tenanted::NoTenantError, "Cannot connect to a tenanted database while untenanted."
+        raise Tenanted::NoTenantError, "Cannot connect to a tenanted database while untenanted (#{@model})."
       end
 
       def new_connection(...)
-        raise Tenanted::NoTenantError, "Cannot connect to a tenanted database while untenanted."
+        raise Tenanted::NoTenantError, "Cannot connect to a tenanted database while untenanted (#{@model})."
       end
     end
   end

test/unit/untenanted_connection_pool_test.rb

@@ -3,17 +3,20 @@
 require "test_helper"
 
 describe ActiveRecord::Tenanted::UntenantedConnectionPool do
-  let(:config) { Object.new }
-  let(:subject) { ActiveRecord::Tenanted::UntenantedConnectionPool.new(config) }
+  with_scenario(:primary_db, :primary_record) do
+    let(:config) { Object.new }
+    let(:subject) { ActiveRecord::Tenanted::UntenantedConnectionPool.new(config, User) }
 
-  [ :lease_connection,
-    :checkout,
-    :with_connection,
-    :new_connection
-  ].each do |method|
-    test "#{method} raises NoTenantError" do
-      assert_raises(ActiveRecord::Tenanted::NoTenantError) do
-        subject.send(method)
+    [ :lease_connection,
+      :checkout,
+      :with_connection,
+      :new_connection
+    ].each do |method|
+      test "#{method} raises NoTenantError" do
+        e = assert_raises(ActiveRecord::Tenanted::NoTenantError) do
+          subject.send(method)
+        end
+        assert_equal("Cannot connect to a tenanted database while untenanted (User).", e.message)
       end
     end
   end