rails_select_on_includes 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb99c7d08c8db00bef1394aac2ac055df1707be5
-  data.tar.gz: 02591eb16f17bb61ba429b4a6d4eb6fad665bfa3
+  metadata.gz: 443283f4904c4f4329a5a32983f4defe8a63a5e3
+  data.tar.gz: 53601f7583dc63c766b8182c0d6b485bd6295cfe
 SHA512:
-  metadata.gz: 7639db4cbef9c67f0f5f04a5034709d2317dda111661f0519c5e5baefc60089edae19d32f844ec7d4293d0f826d878d9d2be3168625709aded1ddd7b8cc90405
-  data.tar.gz: c07bd198ed1cd3eb81d65bcdaa5ddcc25ebc541a505511941ab5ea0cfbdde981e3bcdcbcdde904eae7ac0e6a4696e86dab91b0550068db6793b441ea190446c2
+  metadata.gz: be9bd630a495fd6874d118f2cc06959e18ae792775ede4f0ff44a44d0f5a783606e8a2f47ced47279f01e1f66b7ec5410d58b585da2bec1fbc6532e033e97387
+  data.tar.gz: 7f64aa60dfbfc950696ff200441941482bab8494ecc4d8b167cf2a0207db4f1a5fb9b708760db83bc87d1e6786c2db515e8093d2a9c98a72ab037f6f77f5127d

data/lib/rails_select_on_includes.rb

@@ -4,7 +4,6 @@ require 'active_support/core_ext/string/filters'
 module ActiveRecord
   module Associations
     class JoinDependency # :nodoc:
-
       class Aliases # :nodoc:
         def initialize(tables)
           @tables = tables
@@ -51,9 +50,49 @@ module ActiveRecord
           some_hash.values.map{ |value| value.is_a?(Hash) ? flatten_hash_values( value ) : value }.flatten
         end
       end
+
+      class JoinPart
+        def instantiate(row, aliases, column_types = {}, &block)
+          base_klass.instantiate(extract_record(row, aliases), column_types, &block)
+        end
+      end
+
+      def instantiate(result_set, aliases)
+        primary_key = aliases.column_alias(join_root, join_root.primary_key)
+
+        seen = Hash.new { |i, object_id|
+          i[object_id] = Hash.new { |j, child_class|
+            j[child_class] = {}
+          }
+        }
+
+        model_cache = Hash.new { |h,klass| h[klass] = {} }
+        parents = model_cache[join_root]
+        column_aliases = aliases.column_aliases join_root
+
+        message_bus = ActiveSupport::Notifications.instrumenter
+
+        payload = {
+            record_count: result_set.length,
+            class_name: join_root.base_klass.name
+        }
+
+        message_bus.instrument('instantiation.active_record', payload) do
+          result_set.each { |row_hash|
+            parent_key = primary_key ? row_hash[primary_key] : row_hash
+            # DISTINCTION PART > join_root.instantiate(row_hash, column_aliases, result_set.column_types )
+            # PREVIOUS join_root.instantiate(row_hash, column_aliases )
+            parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, result_set.column_types )
+            construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
+          }
+        end
+        parents.values
+      end
+
     end
   end
 end
+
 module ActiveRecord
   module FinderMethods
 
@@ -81,7 +120,7 @@ module ActiveRecord
           else
             arel = relation.arel
             rows = connection.select_all(arel, 'SQL', relation.bound_attributes)
-            #DISTINCTION IS HERE:
+            #1 DISTINCTION IS HERE:
             # now we gently mokey-patching existing column aliases with select values
             aliases.update_aliases_to_select_values(values[:select]) unless values[:select].blank?
 

data/lib/rails_select_on_includes/version.rb

@@ -1,3 +1,3 @@
 module RailsSelectOnIncludes
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_select_on_includes
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - alekseyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord