rasti-db 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e666cc71839d82d36edfac7d7370d9f31e6d275
-  data.tar.gz: 80a4c04065aa81c0f2c5c3935127d15c36a1127a
+  metadata.gz: 1d89eb87b65dc22b36bc3774325e96fc5170902a
+  data.tar.gz: 60baea5f7737a43060d54a5f8c8f8a35764f8e48
 SHA512:
-  metadata.gz: 50fc211f54d91108ff10290deb0e7ade32cc045424c8228514fddd32c8d5fd3a64fa02e2e5fb3809db3d343f91a90ddd70d392c1eeec65cd5847c5fc5b3a9533
-  data.tar.gz: 8b10f98acbc07463c72bffe2e50117236d882ae3eae0442bef02f4d47124a80a4e0cb52dfb5e31151f3d3b510b21d0489300e782846084ce6b4351f8479b22be
+  metadata.gz: 64105cfa6be8315080047c1447521f105b525a90e51627de77a988f88369cc461f5390c78c0b7262add692acea32fa36a6206a026c896e421ee8187e15935d08
+  data.tar.gz: 51842d19c1e5696299d85c1e001bc0a1b58ef791012394e75693cd0f113084d51b240d8e918666d20eb350f1e404d19fdc3a6955ceebbca017a73b38d91f8e0a

data/lib/rasti/db/relations.rb

@@ -124,6 +124,10 @@ module Rasti
           @relation_collection_name ||= @options[:relation_collection_name] || [source_collection_class.collection_name, target_collection_class.collection_name].sort.join('_').to_sym
         end
 
+        def qualified_target_collection_name(schema=nil)
+          schema.nil? ? target_collection_class.collection_name : Sequel.qualify(schema, target_collection_class.collection_name)
+        end
+
         def qualified_relation_collection_name(schema=nil)
           schema.nil? ? relation_collection_name : Sequel.qualify(schema, relation_collection_name)
         end
@@ -138,13 +142,15 @@ module Rasti
           join_rows = target_collection.dataset
                                        .join(relation_name, target_foreign_key => target_collection_class.primary_key)
                                        .where(Sequel.qualify(relation_name, source_foreign_key) => pks)
+                                       .select_all(qualified_target_collection_name(schema))
+                                       .select_append(Sequel.qualify(relation_name, source_foreign_key).as(:source_foreign_key))
                                        .all
 
           Relations.graph_to join_rows, relations, target_collection_class, db, schema
 
           relation_rows = join_rows.each_with_object(Hash.new { |h,k| h[k] = [] }) do |row, hash| 
             attributes = row.select { |attr,_| target_collection_class.model.attributes.include? attr }
-            hash[row[source_foreign_key]] << target_collection_class.model.new(attributes)
+            hash[row[:source_foreign_key]] << target_collection_class.model.new(attributes)
           end
 
           rows.each do |row| 

data/lib/rasti/db/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module DB
-    VERSION = '0.2.6'
+    VERSION = '0.2.7'
   end
 end

data/spec/collection_spec.rb

@@ -467,11 +467,11 @@ describe 'Collection' do
       stub_db.sqls.must_equal [
         'SELECT * FROM custom_schema.posts',
         'SELECT * FROM custom_schema.users WHERE (id IN (1, 2))',
-        'SELECT * FROM custom_schema.categories INNER JOIN custom_schema.categories_posts ON (custom_schema.categories_posts.category_id = custom_schema.categories.id) WHERE (custom_schema.categories_posts.post_id IN (3, 4))', 
+        'SELECT custom_schema.categories.*, custom_schema.categories_posts.post_id AS source_foreign_key FROM custom_schema.categories INNER JOIN custom_schema.categories_posts ON (custom_schema.categories_posts.category_id = custom_schema.categories.id) WHERE (custom_schema.categories_posts.post_id IN (3, 4))', 
         'SELECT * FROM custom_schema.comments WHERE (post_id IN (3, 4))',
         'SELECT * FROM custom_schema.users WHERE (id IN (2, 1))',
         'SELECT * FROM custom_schema.posts WHERE (user_id IN (1, 2))',
-        'SELECT * FROM custom_schema.categories INNER JOIN custom_schema.categories_posts ON (custom_schema.categories_posts.category_id = custom_schema.categories.id) WHERE (custom_schema.categories_posts.post_id IN (3, 4))'
+        'SELECT custom_schema.categories.*, custom_schema.categories_posts.post_id AS source_foreign_key FROM custom_schema.categories INNER JOIN custom_schema.categories_posts ON (custom_schema.categories_posts.category_id = custom_schema.categories.id) WHERE (custom_schema.categories_posts.post_id IN (3, 4))'
       ]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel