rasti-db 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 210581882359ef05a1b09c69b172f259b0b5010b61a254442e9844158a4f9456
-  data.tar.gz: 1dd3f0fcc8399e0145abc50166495a87826bb1b32e52de4acb45ea114f7650d5
+  metadata.gz: 8b41f6198798c9bee6da1f94742378639bb3b900f3bda6471f791b42a71a24c7
+  data.tar.gz: f470e1f1ef5673546e54e6c144e16ebba577b0f848b8fd59c8822489808a7cbf
 SHA512:
-  metadata.gz: 2c209c735eb50327d4bb7b54754530cd155dec884e32661f046de73dfb53fb036877e1e25f1ade565ef51a0517254096d24934f3d6e47393febc99318ea71118
-  data.tar.gz: a5a8326418216e1558ffea4b93e52a2369420fed2c8d9633dda5ffd8ee34b457e06aaaea2018001ba8725e51c1ef44386a78e2abaa51819628eba93cec38da99
+  metadata.gz: f5e836d580a42656efe1d78ee2e193449edd1adf45dbccd0a4b4c9c4d6f263a0d92e844a142abb908a683a8dcad4865d5926aec10b5a0260c0240425dcd063dd
+  data.tar.gz: 71148abafe56a6fe60613f2ebfa38138df2aaa656bdbe7116a834d41f3920fb49b97bfffac3235a520a6ffbb293184310d2d7fcefa552178d1cb767b94ce8e4d

data/lib/rasti/db/query.rb

@@ -9,7 +9,7 @@ module Rasti
       def initialize(environment:, collection_class:, dataset:, relations_graph:nil)
         @environment = environment
         @collection_class = collection_class
-        @dataset = dataset
+        @dataset = dataset.qualify collection_class.collection_name
         @relations_graph = relations_graph || Relations::Graph.new(environment, collection_class)
       end
 
@@ -74,11 +74,9 @@ module Rasti
 
       def join(*relations)
         graph = Relations::Graph.new environment, collection_class, relations
-        
-        ds = graph.add_joins(dataset)
-                  .distinct
-                  .select_all(collection_class.collection_name)
-        
+
+        ds = graph.add_joins(dataset).distinct
+
         build_query dataset: ds
       end
 

data/lib/rasti/db/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module DB
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/spec/collection_spec.rb

@@ -537,20 +537,20 @@ describe 'Collection' do
         case sql
 
         when 'SELECT users.* FROM schema_1.users', 
-             'SELECT users.* FROM schema_1.users WHERE (id IN (2, 1))'
+             'SELECT users.* FROM schema_1.users WHERE (users.id IN (2, 1))'
           [
             {id: 1},
             {id: 2}
           ]
 
         when 'SELECT posts.* FROM schema_1.posts',
-             'SELECT posts.* FROM schema_1.posts WHERE (user_id IN (1, 2))'
+             'SELECT posts.* FROM schema_1.posts WHERE (posts.user_id IN (1, 2))'
           [
             {id: 3, user_id: 1, language_id: 1},
             {id: 4, user_id: 2, language_id: 2}
           ]
 
-        when 'SELECT comments.* FROM schema_1.comments WHERE (post_id IN (3, 4))'
+        when 'SELECT comments.* FROM schema_1.comments WHERE (comments.post_id IN (3, 4))'
           [
             {id: 5, user_id: 2, post_id: 3},
             {id: 6, user_id: 1, post_id: 3},
@@ -558,7 +558,7 @@ describe 'Collection' do
             {id: 8, user_id: 2, post_id: 4}
           ]
 
-        when 'SELECT languages.* FROM schema_2.languages WHERE (id IN (1, 2))'
+        when 'SELECT languages.* FROM schema_2.languages WHERE (languages.id IN (1, 2))'
           [
             {id: 1},
             {id: 2}
@@ -663,7 +663,7 @@ describe 'Collection' do
       stub_users.where(id: [1,2]).limit(1).order(:name).all
 
       stub_db.sqls.must_equal [
-        'SELECT users.* FROM schema_1.users WHERE (id IN (1, 2)) ORDER BY name LIMIT 1'
+        'SELECT users.* FROM schema_1.users WHERE (users.id IN (1, 2)) ORDER BY users.name LIMIT 1'
       ]
     end
 
@@ -673,13 +673,13 @@ describe 'Collection' do
       stub_db.sqls.must_equal [
         'SELECT posts.* FROM schema_1.posts',
         'SELECT categories.*, categories_posts.post_id AS source_foreign_key FROM schema_1.categories INNER JOIN schema_1.categories_posts ON (schema_1.categories_posts.category_id = schema_1.categories.id) WHERE (categories_posts.post_id IN (3, 4))', 
-        'SELECT comments.* FROM schema_1.comments WHERE (post_id IN (3, 4))',
-        'SELECT users.* FROM schema_1.users WHERE (id IN (2, 1))',
-        'SELECT posts.* FROM schema_1.posts WHERE (user_id IN (1, 2))',
+        'SELECT comments.* FROM schema_1.comments WHERE (comments.post_id IN (3, 4))',
+        'SELECT users.* FROM schema_1.users WHERE (users.id IN (2, 1))',
+        'SELECT posts.* FROM schema_1.posts WHERE (posts.user_id IN (1, 2))',
         'SELECT categories.*, categories_posts.post_id AS source_foreign_key FROM schema_1.categories INNER JOIN schema_1.categories_posts ON (schema_1.categories_posts.category_id = schema_1.categories.id) WHERE (categories_posts.post_id IN (3, 4))',
-        'SELECT languages.* FROM schema_2.languages WHERE (id IN (1, 2))',
+        'SELECT languages.* FROM schema_2.languages WHERE (languages.id IN (1, 2))',
         'SELECT people.*, languages_people.language_id AS source_foreign_key FROM schema_1.people INNER JOIN schema_1.languages_people ON (schema_1.languages_people.document_number = schema_1.people.document_number) WHERE (languages_people.language_id IN (1, 2))',
-        'SELECT users.* FROM schema_1.users WHERE (id IN (1, 2))'
+        'SELECT users.* FROM schema_1.users WHERE (users.id IN (1, 2))'
       ]
     end
 
@@ -687,7 +687,7 @@ describe 'Collection' do
       stub_posts.join('user.person').where(document_number: 'document_1').all
 
       stub_db.sqls.must_equal [
-        "SELECT DISTINCT posts.* FROM schema_1.posts INNER JOIN schema_1.users AS user ON (user.id = posts.user_id) INNER JOIN schema_1.people AS user__person ON (user__person.user_id = user.id) WHERE (document_number = 'document_1')"
+        "SELECT DISTINCT posts.* FROM schema_1.posts INNER JOIN schema_1.users AS user ON (user.id = posts.user_id) INNER JOIN schema_1.people AS user__person ON (user__person.user_id = user.id) WHERE (posts.document_number = 'document_1')"
       ]
     end
 

data/spec/query_spec.rb

@@ -237,7 +237,7 @@ describe 'Query' do
   end
 
   it 'To String' do
-    users_query.where(id: [1,2,3]).order(:name).to_s.must_equal '#<Rasti::DB::Query: "SELECT * FROM `users` WHERE (`id` IN (1, 2, 3)) ORDER BY `name`">'
+    users_query.where(id: [1,2,3]).order(:name).to_s.must_equal '#<Rasti::DB::Query: "SELECT `users`.* FROM `users` WHERE (`users`.`id` IN (1, 2, 3)) ORDER BY `users`.`name`">'
   end
 
   describe 'Named queries' do
@@ -257,19 +257,19 @@ describe 'Query' do
   describe 'Join' do
 
     it 'One to Many' do
-      users_query.join(:posts).where(title: 'Sample post').all.must_equal [User.new(id: 2, name: 'User 2')]
+      users_query.join(:posts).where(Sequel[:posts][:title] => 'Sample post').all.must_equal [User.new(id: 2, name: 'User 2')]
     end
 
     it 'Many to One' do
-      posts_query.join(:user).where(name: 'User 4').all.must_equal [Post.new(id: 3, user_id: 4, title: 'Best post', body: '...', language_id: 1)]
+      posts_query.join(:user).where(Sequel[:user][:name] => 'User 4').all.must_equal [Post.new(id: 3, user_id: 4, title: 'Best post', body: '...', language_id: 1)]
     end
 
     it 'One to One' do
-      users_query.join(:person).where(document_number: 'document_1').all.must_equal [User.new(id: 1, name: 'User 1')]
+      users_query.join(:person).where(Sequel[:person][:document_number] => 'document_1').all.must_equal [User.new(id: 1, name: 'User 1')]
     end
 
     it 'Many to Many' do
-      posts_query.join(:categories).where(name: 'Category 3').order(:id).all.must_equal [
+      posts_query.join(:categories).where(Sequel[:categories][:name] => 'Category 3').order(:id).all.must_equal [
         Post.new(id: 2, user_id: 1, title: 'Another post', body: '...', language_id: 1),
         Post.new(id: 3, user_id: 4, title: 'Best post', body: '...', language_id: 1),
       ]
@@ -283,6 +283,20 @@ describe 'Query' do
                  .must_equal [Post.new(id: 1, user_id: 2, title: 'Sample post', body: '...', language_id: 1)]
     end
 
+    it 'Excluded attributes permanents excluded when join' do
+      posts_query.join(:user)
+                 .exclude_attributes(:body)
+                 .where(Sequel[:user][:name] => 'User 4')
+                 .all
+                 .must_equal [Post.new(id: 3, title: 'Best post', user_id: 4, language_id: 1)]
+
+      posts_query.exclude_attributes(:body)
+                 .join(:user)
+                 .where(Sequel[:user][:name] => 'User 4')
+                 .all
+                 .must_equal [Post.new(id: 3, title: 'Best post', user_id: 4, language_id: 1)]
+    end
+
     describe 'Multiple data sources' do
 
       it 'One to Many' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel