forest_liana 7.6.7 → 7.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d3d3ba2c03e1294df91a54647f23345b4027945cfe4e813d58716e658877f4d
-  data.tar.gz: 1f60dc963548ca99f0f2c01f771fef730a874b0bbf320efb4afd6f9c25e4f6b8
+  metadata.gz: b6a71be315f118a95dfd5fda9b67e825f5b6186fbb3749595254627e1b00c159
+  data.tar.gz: eaf7f9410d7eb574a2bd94da32072294b44441a1bc9c282ca44b7936b948635c
 SHA512:
-  metadata.gz: 9097174cf46b34360a486c8629365acaf130491aac6d9f5dc06568beedf31d93070a1ccf5f2156547ef68b9aab9e0a2705ef8ec58f3662a4829434a3f6ec6819
-  data.tar.gz: f9d1d946fe495e74a7cd0a2929ab208af4a5fa369efae007d838a4edd4f6c66e15ec8a6c9f0b23321e762f9cdeefe2ee9f688fc26a666463804787a2bd9aa0e8
+  metadata.gz: 00d144adc4e07959fd1875011393d59cf3eb61e385863230860238b7747af19ee01c5ef72abf19c7a483421a066d8a78839fe9e4d1e42a2b9f40f513d219ca5a
+  data.tar.gz: 75dec7557415aa5ef7f7d3f14d60e15756526a57ba90760d67eea81d1c95f66d113a60e8da44ea36d13f8e0bf393b7f14b5770ab82d227855fb254425fad8a92

data/app/services/forest_liana/base_getter.rb

@@ -32,15 +32,23 @@ module ForestLiana
 
     def optimize_record_loading(resource, records)
       instance_dependent_associations = instance_dependent_associations(resource)
-      eager_loads = @includes - instance_dependent_associations
 
-      result = records.eager_load(eager_loads)
+      preload_loads = @includes.select do |name|
+        targetModelConnection = resource.reflect_on_association(name).inverse_of&.active_record&.connection
+        targetModelDatabase = targetModelConnection.current_database if targetModelConnection.respond_to? :current_database
+        resourceConnection = resource.connection
+        resourceDatabase = resourceConnection if resourceConnection.respond_to? :current_database
+
+        targetModelDatabase != resourceDatabase
+      end + instance_dependent_associations
+
+      result = records.eager_load(@includes - preload_loads)
 
       # Rails 7 can mix `eager_load` and `preload` in the same scope
       # Rails 6 cannot mix `eager_load` and `preload` in the same scope
       # Rails 6 and 7 cannot mix `eager_load` and `includes` in the same scope
       if Rails::VERSION::MAJOR >= 7
-        result = result.preload(instance_dependent_associations)
+        result = result.preload(preload_loads)
       end
 
       result

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "7.6.7"
+  VERSION = "7.6.8"
 end

data/spec/dummy/app/models/car.rb

@@ -0,0 +1,3 @@
+class Car < GarageRecord
+  belongs_to :driver
+end

data/spec/dummy/app/models/driver.rb

@@ -0,0 +1,3 @@
+class Driver < UserRecord
+  has_one :car
+end

data/spec/dummy/app/models/garage_record.rb

@@ -0,0 +1,4 @@
+class GarageRecord < ApplicationRecord
+  self.abstract_class = true
+  connects_to database: { writing: :garage, reading: :garage }
+end

data/spec/dummy/app/models/user_record.rb

@@ -0,0 +1,4 @@
+class UserRecord < ApplicationRecord
+  self.abstract_class = true
+  connects_to database: { writing: :user, reading: :user }
+end

data/spec/dummy/config/database.yml

@@ -19,6 +19,13 @@ development:
 test:
   <<: *default
   database: db/test.sqlite3
+  
+garage:
+  <<: *default
+  database: db/test2.sqlite3
+user:
+  <<: *default
+  database: db/test3.sqlite3
 
 production:
   <<: *default

data/spec/dummy/db/migrate/20220719094127_create_cars.rb

@@ -0,0 +1,8 @@
+class CreateCars < ActiveRecord::Migration[6.0]
+  def change
+    Car.connection.create_table :cars do |t|
+      t.string :model
+      t.references :driver, index: true
+    end
+  end
+end

data/spec/dummy/db/migrate/20220719094450_create_drivers.rb

@@ -0,0 +1,7 @@
+class CreateDrivers < ActiveRecord::Migration[6.0]
+  def change
+    Driver.connection.create_table :drivers do |t|
+      t.string :firstname
+    end
+  end
+end

data/spec/lib/forest_liana/bootstrapper_spec.rb

@@ -30,7 +30,9 @@ module ForestLiana
           Reference,
           Town,
           Tree,
-          User
+          User,
+          Driver,
+          Car,
         ]
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 7.6.7
+  version: 7.6.8
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -329,6 +329,9 @@ files:
 - spec/dummy/app/controllers/forest/islands_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/application_record.rb
+- spec/dummy/app/models/car.rb
+- spec/dummy/app/models/driver.rb
+- spec/dummy/app/models/garage_record.rb
 - spec/dummy/app/models/island.rb
 - spec/dummy/app/models/location.rb
 - spec/dummy/app/models/owner.rb
@@ -338,6 +341,7 @@ files:
 - spec/dummy/app/models/town.rb
 - spec/dummy/app/models/tree.rb
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/models/user_record.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
@@ -371,6 +375,8 @@ files:
 - spec/dummy/db/migrate/20210326140855_create_locations.rb
 - spec/dummy/db/migrate/20210511141752_create_owners.rb
 - spec/dummy/db/migrate/20210526084712_create_products.rb
+- spec/dummy/db/migrate/20220719094127_create_cars.rb
+- spec/dummy/db/migrate/20220719094450_create_drivers.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/forest_liana/collections/island.rb
 - spec/dummy/lib/forest_liana/collections/location.rb
@@ -518,179 +524,185 @@ signing_key:
 specification_version: 4
 summary: Official Rails Liana for Forest
 test_files:
-- test/forest_liana_test.rb
-- test/services/forest_liana/schema_adapter_test.rb
-- test/services/forest_liana/operator_date_interval_parser_test.rb
+- test/fixtures/has_one_field.yml
+- test/fixtures/string_field.yml
+- test/fixtures/belongs_to_field.yml
+- test/fixtures/reference.yml
+- test/fixtures/has_many_field.yml
+- test/fixtures/serialize_field.yml
+- test/fixtures/owner.yml
+- test/fixtures/tree.yml
+- test/fixtures/has_many_through_field.yml
 - test/test_helper.rb
-- test/routing/route_test.rb
-- test/dummy/db/migrate/20150608133044_create_has_one_field.rb
-- test/dummy/db/migrate/20181111162121_create_references_table.rb
-- test/dummy/db/migrate/20150608131430_create_integer_field.rb
-- test/dummy/db/migrate/20150608133038_create_belongs_to_field.rb
-- test/dummy/db/migrate/20150608130516_create_date_field.rb
-- test/dummy/db/migrate/20160627172951_create_tree.rb
-- test/dummy/db/migrate/20150616150629_create_polymorphic_field.rb
-- test/dummy/db/migrate/20170614141921_create_serialize_field.rb
-- test/dummy/db/migrate/20160628173505_add_timestamps.rb
-- test/dummy/db/migrate/20150608132159_create_boolean_field.rb
-- test/dummy/db/migrate/20150814081918_create_has_many_through_field.rb
-- test/dummy/db/migrate/20150608132621_create_string_field.rb
-- test/dummy/db/migrate/20150608150016_create_has_many_field.rb
-- test/dummy/db/migrate/20150612112520_create_has_and_belongs_to_many_field.rb
-- test/dummy/db/migrate/20150608131610_create_float_field.rb
-- test/dummy/db/migrate/20150608131603_create_decimal_field.rb
-- test/dummy/db/migrate/20150609114636_create_belongs_to_class_name_field.rb
-- test/dummy/db/migrate/20160627172810_create_owner.rb
-- test/dummy/db/migrate/20150623115554_create_has_many_class_name_field.rb
-- test/dummy/db/schema.rb
+- test/dummy/config.ru
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/404.html
 - test/dummy/README.rdoc
+- test/dummy/config/secrets.yml
+- test/dummy/config/locales/en.yml
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/database.yml
+- test/dummy/config/application.rb
 - test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config/application.rb
-- test/dummy/config/database.yml
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/routes.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/app/models/serialize_field.rb
-- test/dummy/app/models/has_many_through_field.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/models/has_many_field.rb
 - test/dummy/app/models/belongs_to_field.rb
+- test/dummy/app/models/has_and_belongs_to_many_field.rb
+- test/dummy/app/models/has_many_class_name_field.rb
+- test/dummy/app/models/date_field.rb
+- test/dummy/app/models/has_one_field.rb
 - test/dummy/app/models/decimal_field.rb
-- test/dummy/app/models/owner.rb
+- test/dummy/app/models/integer_field.rb
+- test/dummy/app/models/tree.rb
 - test/dummy/app/models/belongs_to_class_name_field.rb
-- test/dummy/app/models/string_field.rb
-- test/dummy/app/models/has_many_class_name_field.rb
-- test/dummy/app/models/reference.rb
 - test/dummy/app/models/boolean_field.rb
-- test/dummy/app/models/polymorphic_field.rb
-- test/dummy/app/models/tree.rb
-- test/dummy/app/models/has_many_field.rb
-- test/dummy/app/models/has_and_belongs_to_many_field.rb
-- test/dummy/app/models/integer_field.rb
-- test/dummy/app/models/date_field.rb
+- test/dummy/app/models/has_many_through_field.rb
 - test/dummy/app/models/float_field.rb
-- test/dummy/app/models/has_one_field.rb
+- test/dummy/app/models/string_field.rb
+- test/dummy/app/models/owner.rb
+- test/dummy/app/models/serialize_field.rb
+- test/dummy/app/models/polymorphic_field.rb
+- test/dummy/app/models/reference.rb
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/bin/rails
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/config.ru
+- test/dummy/app/assets/config/manifest.js
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/db/migrate/20150623115554_create_has_many_class_name_field.rb
+- test/dummy/db/migrate/20150612112520_create_has_and_belongs_to_many_field.rb
+- test/dummy/db/migrate/20160627172810_create_owner.rb
+- test/dummy/db/migrate/20160627172951_create_tree.rb
+- test/dummy/db/migrate/20150814081918_create_has_many_through_field.rb
+- test/dummy/db/migrate/20150608130516_create_date_field.rb
+- test/dummy/db/migrate/20150608132621_create_string_field.rb
+- test/dummy/db/migrate/20160628173505_add_timestamps.rb
+- test/dummy/db/migrate/20150609114636_create_belongs_to_class_name_field.rb
+- test/dummy/db/migrate/20150608131610_create_float_field.rb
+- test/dummy/db/migrate/20170614141921_create_serialize_field.rb
+- test/dummy/db/migrate/20150608131430_create_integer_field.rb
+- test/dummy/db/migrate/20150608133044_create_has_one_field.rb
+- test/dummy/db/migrate/20150608131603_create_decimal_field.rb
+- test/dummy/db/migrate/20150608133038_create_belongs_to_field.rb
+- test/dummy/db/migrate/20150616150629_create_polymorphic_field.rb
+- test/dummy/db/migrate/20181111162121_create_references_table.rb
+- test/dummy/db/migrate/20150608150016_create_has_many_field.rb
+- test/dummy/db/migrate/20150608132159_create_boolean_field.rb
+- test/dummy/db/schema.rb
 - test/dummy/Rakefile
-- test/fixtures/tree.yml
-- test/fixtures/string_field.yml
-- test/fixtures/owner.yml
-- test/fixtures/has_one_field.yml
-- test/fixtures/serialize_field.yml
-- test/fixtures/reference.yml
-- test/fixtures/belongs_to_field.yml
-- test/fixtures/has_many_through_field.yml
-- test/fixtures/has_many_field.yml
-- spec/requests/resources_spec.rb
-- spec/requests/authentications_spec.rb
-- spec/requests/count_spec.rb
+- test/routing/route_test.rb
+- test/forest_liana_test.rb
+- test/services/forest_liana/schema_adapter_test.rb
+- test/services/forest_liana/operator_date_interval_parser_test.rb
+- spec/helpers/forest_liana/query_helper_spec.rb
+- spec/helpers/forest_liana/schema_helper_spec.rb
 - spec/requests/actions_controller_spec.rb
-- spec/requests/cors_spec.rb
+- spec/requests/authentications_spec.rb
 - spec/requests/test.ru
+- spec/requests/cors_spec.rb
 - spec/requests/stats_spec.rb
+- spec/requests/count_spec.rb
+- spec/requests/resources_spec.rb
 - spec/spec_helper.rb
-- spec/services/forest_liana/filters_parser_spec.rb
-- spec/services/forest_liana/resources_getter_spec.rb
-- spec/services/forest_liana/line_stat_getter_spec.rb
-- spec/services/forest_liana/ip_whitelist_checker_spec.rb
-- spec/services/forest_liana/schema_adapter_spec.rb
-- spec/services/forest_liana/value_stat_getter_spec.rb
-- spec/services/forest_liana/permissions_formatter_spec.rb
-- spec/services/forest_liana/has_many_getter_spec.rb
-- spec/services/forest_liana/resource_updater_spec.rb
-- spec/services/forest_liana/permissions_getter_spec.rb
-- spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb
-- spec/services/forest_liana/scope_manager_spec.rb
-- spec/services/forest_liana/permissions_checker_live_queries_spec.rb
-- spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb
-- spec/services/forest_liana/apimap_sorter_spec.rb
-- spec/services/forest_liana/pie_stat_getter_spec.rb
-- spec/services/forest_liana/smart_action_field_validator_spec.rb
-- spec/dummy/db/migrate/20210526084712_create_products.rb
-- spec/dummy/db/migrate/20190716135241_add_type_to_user.rb
-- spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb
-- spec/dummy/db/migrate/20190226172951_create_user.rb
-- spec/dummy/db/migrate/20190226174951_create_tree.rb
-- spec/dummy/db/migrate/20190226173051_create_isle.rb
-- spec/dummy/db/migrate/20210326140855_create_locations.rb
-- spec/dummy/db/migrate/20210326110524_create_references.rb
-- spec/dummy/db/migrate/20210511141752_create_owners.rb
-- spec/dummy/db/schema.rb
+- spec/dummy/config.ru
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
 - spec/dummy/README.rdoc
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/forest_liana.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/forest_liana.rb
 - spec/dummy/config/routes.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/app/models/town.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/models/driver.rb
+- spec/dummy/app/models/car.rb
+- spec/dummy/app/models/garage_record.rb
+- spec/dummy/app/models/user_record.rb
+- spec/dummy/app/models/product.rb
+- spec/dummy/app/models/sub_application_record.rb
+- spec/dummy/app/models/tree.rb
+- spec/dummy/app/models/island.rb
 - spec/dummy/app/models/owner.rb
-- spec/dummy/app/models/location.rb
-- spec/dummy/app/models/reference.rb
 - spec/dummy/app/models/application_record.rb
-- spec/dummy/app/models/tree.rb
-- spec/dummy/app/models/product.rb
+- spec/dummy/app/models/town.rb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/models/island.rb
-- spec/dummy/app/models/sub_application_record.rb
+- spec/dummy/app/models/reference.rb
+- spec/dummy/app/models/location.rb
+- spec/dummy/app/config/routes.rb
 - spec/dummy/app/controllers/forest/islands_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/config/routes.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/bin/rails
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
-- spec/dummy/config.ru
-- spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/lib/forest_liana/collections/island.rb
+- spec/dummy/lib/forest_liana/collections/user.rb
+- spec/dummy/lib/forest_liana/collections/location.rb
 - spec/dummy/lib/forest_liana/controllers/owners_controller.rb
 - spec/dummy/lib/forest_liana/controllers/owner_trees_controller.rb
-- spec/dummy/lib/forest_liana/collections/location.rb
-- spec/dummy/lib/forest_liana/collections/user.rb
-- spec/dummy/lib/forest_liana/collections/island.rb
-- spec/rails_helper.rb
+- spec/dummy/db/migrate/20190226173051_create_isle.rb
+- spec/dummy/db/migrate/20210326140855_create_locations.rb
+- spec/dummy/db/migrate/20190716135241_add_type_to_user.rb
+- spec/dummy/db/migrate/20220719094127_create_cars.rb
+- spec/dummy/db/migrate/20210511141752_create_owners.rb
+- spec/dummy/db/migrate/20220719094450_create_drivers.rb
+- spec/dummy/db/migrate/20210526084712_create_products.rb
+- spec/dummy/db/migrate/20190226174951_create_tree.rb
+- spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb
+- spec/dummy/db/migrate/20190226172951_create_user.rb
+- spec/dummy/db/migrate/20210326110524_create_references.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/Rakefile
 - spec/config/initializers/logger_spec.rb
-- spec/helpers/forest_liana/schema_helper_spec.rb
-- spec/helpers/forest_liana/query_helper_spec.rb
-- spec/lib/forest_liana/schema_file_updater_spec.rb
 - spec/lib/forest_liana/bootstrapper_spec.rb
+- spec/lib/forest_liana/schema_file_updater_spec.rb
+- spec/services/forest_liana/smart_action_field_validator_spec.rb
+- spec/services/forest_liana/apimap_sorter_spec.rb
+- spec/services/forest_liana/value_stat_getter_spec.rb
+- spec/services/forest_liana/filters_parser_spec.rb
+- spec/services/forest_liana/line_stat_getter_spec.rb
+- spec/services/forest_liana/permissions_formatter_spec.rb
+- spec/services/forest_liana/ip_whitelist_checker_spec.rb
+- spec/services/forest_liana/permissions_getter_spec.rb
+- spec/services/forest_liana/pie_stat_getter_spec.rb
+- spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb
+- spec/services/forest_liana/scope_manager_spec.rb
+- spec/services/forest_liana/has_many_getter_spec.rb
+- spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb
+- spec/services/forest_liana/resource_updater_spec.rb
+- spec/services/forest_liana/permissions_checker_live_queries_spec.rb
+- spec/services/forest_liana/resources_getter_spec.rb
+- spec/services/forest_liana/schema_adapter_spec.rb
+- spec/rails_helper.rb