forest_liana 9.20.2 → 9.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de38bb4323a6676a9185bee03e2ba490c9b9bc2be0fcb41e213849ef9755c9f2
-  data.tar.gz: 54e8bd60a653ecdf126480f2530b15cf52c024d9b69acd3152fd7ffa86f52c0e
+  metadata.gz: be12c6b12347b9f674f52eb7f52b41294717436fae76926129d02b6194d6a116
+  data.tar.gz: 3a2d7c0a34e7cadbfc40d70b4385d23ffe703de619f9c28b49a10af86a23a8f5
 SHA512:
-  metadata.gz: c319db67ae5621fd89a52d86e02022b73c4a2872763ec1cc48ef5a43c0f9b47b0ae3fa4927c1d180b60d0af83dfaa6085e788f8e66b91c3213c804a9e5fc56b6
-  data.tar.gz: 2d59d2fb65f0b2c05e189e11d25d20dcf9980fe9dc23d4c1f14c96050a7ef67bc7e162731b0fe5f6c0a717557ba9b8b12d98d4481197abc21a69b9d2a1c5b900
+  metadata.gz: 3c32654d08132350f85a8313b7ef296838782d72e367509c4283990fb7fda261e453629e0b44f268ece649ae2889ec67dea07c31a6b4b3f2f799178367c016d4
+  data.tar.gz: 205dad627f2752573f9f8e9c9a17e8e5a1ec3ad2260bad68a041b38d783060ee5f399950928a8b7f6ea8bf3b450d23878ec5fac7247d7c5e067b323348b4acf0

data/app/services/forest_liana/base_getter.rb

@@ -51,10 +51,8 @@ module ForestLiana
     def separate_database?(resource, association)
       return false if SchemaUtils.polymorphic?(association)
 
-      target_model_connection = association.klass.connection
-      target_model_database = target_model_connection.current_database if target_model_connection.respond_to? :current_database
-      resource_connection = resource.connection
-      resource_database = resource_connection.current_database if resource_connection.respond_to? :current_database
+      target_model_database = association.klass.connection.pool.db_config.database
+      resource_database = resource.connection.pool.db_config.database
 
       target_model_database != resource_database
     end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.20.2"
+  VERSION = "9.20.3"
 end

data/spec/services/forest_liana/resources_getter_spec.rb

@@ -83,26 +83,6 @@ module ForestLiana
       let(:resource) { Product }
       let(:fields) { { resource.name => 'id,name,manufacturer', 'manufacturer' => 'name' } }
 
-      shared_context 'resource current_database' do
-        before do
-          connection = resource.connection
-
-          def connection.current_database
-            'db/test.sqlite3'
-          end
-        end
-
-        after do
-          resource.connection.singleton_class.remove_method(:current_database)
-        end
-      end
-
-      shared_examples 'left outer join' do
-        it 'should perform a left outer join with the association' do
-          expect(getter.perform.to_sql).to match(/LEFT OUTER JOIN "manufacturers"/)
-        end
-      end
-
       shared_examples 'records' do
         it 'should get only the expected records' do
           getter.perform
@@ -117,40 +97,38 @@ module ForestLiana
         end
       end
 
-      context 'when the connections do not support current_database' do
-        include_examples 'left outer join'
+      context 'when the included association is in the same database' do
+        it 'performs a left outer join with the association' do
+          expect(getter.perform.to_sql).to match(/LEFT OUTER JOIN "manufacturers"/)
+        end
+
         include_examples 'records'
       end
 
-      context 'when the included association uses a different database connection' do
+      context 'when the included association is in a different database' do
         let(:fields) { { resource.name => 'id,name,driver', 'driver' => 'firstname' } }
 
-        before do
-          association_connection = resource.reflect_on_association(:driver).klass.connection
-
-          def association_connection.current_database
-            'db/different_test.sqlite3'
-          end
-        end
-
-        after do
-          resource.reflect_on_association(:driver).klass.connection.singleton_class.remove_method(:current_database)
-        end
-
-        include_context 'resource current_database'
-
-        include_examples 'records'
-
         it 'does not perform a left outer join with the association' do
           expect(getter.perform.to_sql).not_to match(/LEFT OUTER JOIN "drivers"/)
         end
+
+        include_examples 'records'
       end
 
-      context 'when the included association uses the same database connection' do
-        include_context 'resource current_database'
+      it 'resolves the database without issuing a SQL query' do
+        getter
 
-        include_examples 'left outer join'
-        include_examples 'records'
+        queries = []
+        subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*, payload|
+          queries << payload[:sql] unless payload[:name] == 'SCHEMA' || payload[:cached]
+        end
+        begin
+          getter.send(:separate_database?, Product, Product.reflect_on_association(:manufacturer))
+        ensure
+          ActiveSupport::Notifications.unsubscribe(subscriber)
+        end
+
+        expect(queries).to be_empty
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.20.2
+  version: 9.20.3
 platform: ruby
 authors:
 - Sandro Munda